Merge remote branch 'working/user/dbwells/serial_items_and_note_fixes'