Merge in build-info command and TEA updates