[forge-commits] [forge/core] 35efa8: FORGE-863: Added changes from F1