[#861816] Initial work for getting makeAPI in thimble.