MERGE branches/concurrency 108301:108557 into trunk