Merge "Making software km implementation both backup and default"