Extend timeout for scaling activities to complete
Merge remote-tracking branch 'origin/testing' into testing