Pull hotfixes#1765

MauroToscano wants to merge 4 commits intostagingyetanotherco/aligned_layer:stagingfrom

testnetyetanotherco/aligned_layer:testnetCopy head branch name to clipboard