2: Migrate core behavior to new base

Task-Url: #2
1 job for v2.0-dev in 1 minute and 44 seconds (queued for 1 second)