Restored Scalability as it is now reimplemented
Merge branch 'restored_scalability' into develop