Merge pull request #6749 from Baystation12/master

Master -> Freeze
Merge pull request #6855 from Baystation12/master

Master - > Freeze
Merge pull request #9 from Baystation12/dev-freeze

Merge updates from Baystation12