LP #1705497 Replaces functionality in web client from legacy