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