Merge "Status: Make various improvements to the Status class"