REP-745-2: updated change to master