19188

Please pull in the recent changes to hopefully resolve flickering and formatting adjustments that got lost.