FORGE-863: Added changes from F1