Merge commits from the dbushell (original) branch