OZP-10: fix tests failing in firefox because of leak
OZP-10: comment out fetch on show for now
merging master into branch; resolving a conflict.