Possible fix for stale data warning colors not clearing
Merge branch 'hotfix/0.3.1' into develop