Additional commits for supporting portals4.  It seems that the previous commit
only updated newly added files.