As described in #12291, final assignments and assignments are clearing both command types. (cherry picked from commit 967de8fa) (cherry picked from commit 87c70a9a)