Cleanings
Merge remote-tracking branch 'origin/feature-speed-up' into feature-speed-up