Manual update of 6.3.0 to 6.3.1 (including icons)