BAMPFA-326: Move this feature into shared UCB branch, so it's available to all deployments.