Merge branch 'rnou/rename_trunc' into rnou/rename_test