Merge branches 'version3' and 'temp6' into version3
ready for stage 1 integrated testing. still need timeout conditions