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