Review #6 and then add an env var to enable that functionality once merged
Review #6 and then add an env var to enable that functionality once merged