Merge "DALi Version 2.2.20" into devel/master