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