Sync with trunk and antipodes 10493