Initial fix for FORGE-1030.
Ignored test case not working yet.