This should also take care of inserting missing imports.
RTC 379
bulk defer of "feature-like" issues to next major release (2.3 to 2.4).
RTC 379