Merging REP-105 compliant changes from master to hydro-devel