Fix LIMS-671 in develop