[COMMIT] Infrastructure update 1