more checking for the display template bundle
Merge remote-tracking branch 'origin/master'
still working on cursor readout for radar
Merge remote-tracking branch 'origin/master'