CFY-517 change provider context id