Cherrypick updates to handle different extension types
Build release versions