plx/mwk merging code update