Merge "DALi Version 1.3.16" into devel/master