Merge branch 'connor-freefield' into connor