Merge "DALi Version 1.9.22" into devel/master