Merge "pjproject: fixed a few bugs"