from REPLACE_ME_ON_NEXT_RELEASE to 4.1