Import requirements for d7281d8

d7281d8 Merge branch 'hotfix/4.0.1' into develop