Apply #80d12ab and #06f6c11 on v1.1.0