v2.4 new lab creation fix
v2.4 new lab creation fix 2
merged wth v2.4 fix