141 should have higher priority in my mind. 142 could likely be resolved by a condition flaggable by env variable