* INS-2798: Refactor polaris to make it more compatible with other oss projects * INS-2798: Refactor polaris to make it more compatible with other oss projects * Fix