Merged 1.1.18.00