[PWIFE-869] PWIFE-869