Merge "Add support of updatable APEX"