Removing patch for 812058 which was committed in version 2.3 and re-applying the entity action patch against 2.3.