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