r15: syncing for 3.0.3pre2