Bug-fix:

 - Fix BCs instead of accumulating in 2D to account for global points
 - Might need a re-look
 - Back-ported from 2.2.x