[bknr-ticket] Re: #11: Clean up branches and merge