Commits
Merge branch 'bugfix/refactor' into bugfix/FS-8808-avmd-code-refactor This commit merges changes from bugfix/refactor that was created by myself to refactor [avmd] code. There was no Jira issue for this change, so after Jira issue has been set up I have created this branch to fix Jira case.
