Fix FORGE-1047
Test for FORGE-1047