issue #22155: Minor fixes for P/O.
issue #22341: Add new option to force reference of toMany column back to base table for extensions.