Issue 1100740 + autoland

ah it's fine to keep it on next release.