Merge v2 changes like scaling apps into master