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