Fixed FORGE-1461 and FORGE-1623