Maint issue 1570