LPS-40725

Fix for FACES-1717 and LPS-30908.