9 Commits (cross-platform-factory-redux)