r2947: applying changes for 2.2.12