= refactoring and cleanup of feature/support-content-range