[forge-commits] [forge/core] 5d05f9: Added changes suggested by Gunnar