Merge "fix error ns_instances_content when not instantiated, rollback problems and...