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