Modified boundary classes
Merged changes