Merge patches 05 and 06