added newest common master changes, operation enum