DS-1331.  Continued POM work.  Merges from master.