First file from the bugfix branch.