8.17 Back to the lab commit