Merge pull request #34858 from s-aga-r/FIX-ISS-23-24-00199

fix: unable to change `company` for manual `Serial No` entry