LU-8569 needs to be ported to the 2.8 FE branch. I am creating this ticket so we can keep track of progress on this task.