''Backported'' existing functionality given by env variables
Updated documentation