fix(3.3.3): two followups from #1145 before tag cut#1147

bensig merged 3 commits intodevelopMemPalace/mempalace:developfrom

fix/3.3.3-followupsMemPalace/mempalace:fix/3.3.3-followupsCopy head branch name to clipboard