Adding corrective 'action' api
Merge branch 'master' into releases/3.0.x