Finished migration to 2.3.4