FORGE-1036: Fix for Offline flag