Committing merging of term insurance product flow
Merged changes update to PM-28