merges in Helpshift PN changes from feature/helpshift-integration branch