Merge "Remove duplicate sealed node checks, add missing checks" into klp-dev