System admin realtime implementation
Merge commit '2dde41b68301e28ad006ec24b14a21f63bf31f61'