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