Merge "added code to clear 2nd order block when appropriate"