Backport the simplified actions tp play2.2.x from master.