Preparing migration to 7X