Merge "Update operations-api stack"