[#RPLYTOAPP-17]
fixed merge conflicts with master