Submitting the smbtar changes to the main branch as well.