Merge "Align on release 4.1.3"