Merge "DALi Version 1.3.9" into devel/master