Feature freeze in preparation for v4.2