Merged featureBeansGBPA branch into consequence-type-gbpa
Pull from origin consequence-type-gbpa