Merge "DALi Version 1.3.5" into devel/master