issue #19550: Add support for standard cost. Other tweaks.