RIX-1029: from developer 2
developer 2 merged the latest code