NXCONNECT-630 Align on 5.9.3