upgrade to v4.0.36

Description

Before we update to v5.X, we need to move to latest 4.X