bumped up test timeout
Merge remote-tracking branch 'origin/develop' into feature/textWidthMargins