merge branch 'fix-anomaly-factory'