Merge "DALi Version 2.1.27" into devel/master