Fix calc shipping not bluring.
Merge remote-tracking branch 'origin/master' into Stable