Merge "DALi Version 2.2.22" into devel/master