[1.3.3] Prepare for next iteration of development