[support] Step 8 of basic form - rebuild