[1.4.1] Prepare for next iteration of development