Area Fixes
Merge pull request #6157 from Raptor1628/dev-freeze

Area Fixes