Merge "Proper check for false when checking parentid"