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