Remove broken forge modules
Merge branch 'master' into featurebranch