t680 -- Fixed issues with modules starts with P
Merge branch 't680' into resolved