Pre-sync with trunk
Pre-sync with trunk in preparation for merge