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