Fixes: #U4-2403
Merge branch '6.0.7' into 6.1.2