Moving some re-org changes upstream
Merge remote-tracking branch 'gerry/to_actions' into develop