Merge "Added Node status monitoring"