Merged for release 10.16