Merge "Reduce scope of hotfix|update"