Factor detection initial work
Resolved merge conflicts sidestepped in handling the rebase
Pared down the tracing a little to remove superfluous details
Merged 'develop'.