fix with mpk done. Need db correction. Userstory 498 done.
Merge branch 'bugWithMPK' into staging