Merge "BUG-650: use weakCompareAndSwap()"