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