Merge "ApiSandbox: Visual separation of fields"