[TIMOB-14617] Unblock hyperloop
Merge pull request #4937 from vishalduggal/timob-14617

[TIMOB-14617] Code refactor to remove undeclared class warning