[1.2.2] Merge branch 'paazmaya-master' into dev