refs #14 - reverted pc.wait_prim_timeout back to original
refs #14 - removed isolation in 1-to-1 view transition
Merge commit '570e5fb31c6d1b474a07b24c8e83a45e592d5418' into 3.x
Merge commit 'fe8e51054ad43ba5b41c1dbb51cda0624114c2bc' into 3.x