[forge-commits] [forge/core] 37f4ad: Sync'ed with master branch