Merge "Address Mesh API feedback"