Attempt to fix appearance flicker issue
Merge remote-tracking branch 'origin/master' into ObjectServiceFix
Merge pull request #1248 from CharonInferar/ObjectServiceFix

Attempt to fix appearance flicker issue