Merge commit 'mikeperry/circuitbuildtimeout-final'