[forge-commits] [forge/core] 49dae6: Fixed FORGE-1461 and FORGE-1623