merge to locking primates branch