Provide helpful messages on column renaming errors
Merge branch 'fix/1899' into develop