[forge-commits] [forge/core] e2916a: FORGE-677 and FORGE-655 missing code