Merging REP-105 compliant branch