Merge "Ignore disallowed adjustments"