Exclude the JSFS' border from smoothing
Merge branch 'smoothing_border' into develop