#5335 #5336 fixes #5255
#5335 #5336 fixes #5255

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