Merge branch 'output-limits' into dev-150714-1115