Anded Feature tests for [#60141984 and [#60141966]