Merge branch 'rnou/rename_test' into 'master'

Experimental rename approach

See merge request !133