Basvi-UAT015

Alignment issues for payor and LA2