Merge "Change operation id from integer to string representation"