sync with v1.1.1 updates