Merge latest mods to dev

include oremj's staging patch & accumulated patches from jrconlin