Manual import of v1.1.2
429 files changed