Swc 471 patch2 (have to merge up plfm-1805 as SWC-471 is dependent on it)