Merge remote-tracking branch 'refs/remotes/origin/add_vpc_endpoints' into add_vpc_endpoints

Author: anthony-nhs