Update to trunk r202909

Can you please look at how to better solve the merge conflicts with r200513?