Merge "Fixed backward compatibility lab pipeline code"