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