chore: merge UAT fixes to '18.0-btl-dev'#59

stopkovae merged 4 commits into

18.0-btl-devBTLzdravtech/stock:18.0-btl-devfrom

18.0-btl-dev_code_review_patch_fcarliniBTLzdravtech/stock:18.0-btl-dev_code_review_patch_fcarliniCopy head branch name to clipboard