No ticket: sync with master @ b75b9ef8