Merge "(Partial update) Fix surface damage area" into devel/master