LPS-38110 - This is a previous pull to bug solution - MORE TO COME