BZ-12688: Fixing discrepancies between EBP and UI