#421 reproduced in test
#421 fixed and reproduced in AlterTest
#421 polished
#421 polished