Hotfix/lims 1467