Block Distribution now definable in maps.
Merge branch 'BlockDistribution' into Team-Refactoring