Fe pr changes

@twinge these are changes I've done to support ccc360/panorama work
I wonder how this went missing...