[dali_1.2.62] Merge branch 'devel/master'