18 Commits (testing/funmap_changes)