chore: merge fix into '18.0-btl-dev'#68

stopkovae merged 2 commits into

18.0-btl-devBTLzdravtech/account-payment:18.0-btl-devfrom

18.0-btl-dev-changed-inheritanceBTLzdravtech/account-payment:18.0-btl-dev-changed-inheritanceCopy head branch name to clipboard