[3.3.3.1] Prepare for next iteration of development