Merge API conversion changes to master.