[forge-commits] [forge/core] f0c425: Added @Overrides annotation and minor fixes