resolved features 1239, 1238