taking out rpsec changes pending implementation decision
Merge branch 'flow'