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