[PWIFE-820] PWIFE-820