final changes for GhprbBuilds