post legacy-0.10.0
CXX-98 Add findAndModify helper