Merge for release 11.12.4.rc.0