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