LPS-29927 Apply needed changes to front end as well