Merged 1.1.16.04