PHOENIX-7008: Fix for parser gap and fix for failing test (#1812)

3 files changed