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