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