Renaming class to avoid conflic with Helpshift sdk
merge master