LPS-45500 SF - Move logic to the DisplayContext