Merge branch 'mtp1376-varzesh3'