Merge "Add support for custom quota-exceeded messages"