Implemented forge-862