r2176: syncing necessary changes for 3.0.7