Enhancement ARQ-1624 and Fixes for ARQ-1736, ARQ-1737