more bootstrap migration for 1.3.6