Merge "Revert "OMS: add transactional API""