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