am 22e0ce3a: DO NOT MERGE Add locking to prevent races between setting class methods and marking

* commit '22e0ce3a73760757e509032a324bbbb9a1a93f5e':
  DO NOT MERGE Add locking to prevent races between setting class methods and marking