Use ContextTypeAttribute during migration discovery
Merge branch 'release' into dev