Merge branch 'patch/laboratory' into dev