Merge tag 'v4.1.2' into backport/v4.1.2/snapshot

This is the 4.1.2 stable release