Merge "DALi Version 2.1.20" into devel/master