Fixes #3063 Started to migrate packages