Merge "Update block rules on nodes"