LIMS-1517 Fixed
LIMS-1518 Fixed
Changelog
Merge branch 'bugfix/1517' into hotfix/3.1.7