Fe pr changes

@twinge these are changes I've done to support ccc360/panorama work
Found it, I commented about it at  https://github.com/CruGlobal/sp/commit/b86ce47def46bfeaa1661a7fb25b362ec759c70f#diff-b5d74e75045f5eb23f0f2b890b289021R52