attempts to merge Marek's tree with mainline tree