Merge up to master

Changes for OF mode Soylent Independancy changes