Merge "DALi Version 1.1.22" into devel/master