Cross GM migration support
remove comment