fixed issue with selecting non-existant common stockout
Merge remote-tracking branch 'origin/USSD-updated-branch' into USSD-updated-branch
Merge branch 'USSD-updated-branch'