Merge "Fix REST API inconsistency"