Add spec for #1940 and #1941.