Push v4 to production, Issue #39