Test.
d11
merge
fix
add
Re-enable tests
Merge branch '5978' into 6007.