Merge "DALi Version 2.0.22" into devel/master