Merge "Support autoholding nodes for specific changes/refs"