Migrating to V6.1

From C-7KDB897