Merge pull request #8469 from mbauskar/pos-fixes

[minor] POS & RFQ format_number fixes