Fix some refactoring issues
Finished feature 61654344/release-append.