Merge "DALi Version 2.0.20" into devel/master