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