Merge "BUG-692 Replace strings with ModifyAction enum"