Merge dev/fluorine work across to master