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