Merging in background changes for awareness.html