Merge pull request #6749 from Baystation12/master

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

Master - > Freeze