Restore remarks column
Merge branch 'restore_remarks_column' into develop