Gee offset exposure 1994 rebased

rebased #1994 

squashed the first 4 commits to get rid of manual sync