Syncing code for enhanced hex grid tooling
Syncing code for Hex-Grid changes