Add issues #5347 and #5346
Add issues #5347 and #5346

jonschoning/stackage,iand675/stackage,fpco/stackage,Daniel-Diaz/stackage,simonmichael/stackage,mrkkrp/stackage,clinty/stackage,soenkehahn/stackage,massysett/stackage,asr/stackage,michalkonecny/stackage