XC5.1 update
Merge commit '98d3a7f' into develop