diff --git a/includes/MobileFormatter.php b/includes/MobileFormatter.php
index 9a88fbb9e..0686414e4 100644
--- a/includes/MobileFormatter.php
+++ b/includes/MobileFormatter.php
@@ -1,735 +1,735 @@
 <?php
 /**
  * MobileFormatter.php
  */
 
 use HtmlFormatter\HtmlFormatter;
 
 /**
  * Converts HTML into a mobile-friendly version
  */
 class MobileFormatter extends HtmlFormatter {
 	/**
 	 * Class name for collapsible section wrappers
 	 */
 	const STYLE_COLLAPSIBLE_SECTION_CLASS = 'collapsible-block';
 	/**
 	 * Whether scripts can be added in the output.
 	 * @var boolean $scriptsEnabled
 	 */
 	private $scriptsEnabled = true;
 
 	/**
 	 * The current revision id of the Title being worked on
 	 * @var Integer $revId
 	 */
 	private $revId;
 
 	/** @var array $topHeadingTags Array of strings with possible tags,
 		can be recognized as top headings. */
 	public $topHeadingTags = [];
 
 	/**
 	 * Saves a Title Object
 	 * @var Title $title
 	 */
 	protected $title;
 
 	/**
 	 * Whether the table of contents is needed on this page
 	 * @var boolean $isTOCEnabled
 	 */
 	protected $isTOCEnabled = false;
 
 	/**
 	 * Are sections expandable?
 	 * @var boolean $expandableSections
 	 */
 	protected $expandableSections = false;
 	/**
 	 * Whether actual page is the main page
 	 * @var boolean $mainPage
 	 */
 	protected $mainPage = false;
 
 	/**
 	 * Name of the transformation option
 	 * @const string SHOW_FIRST_PARAGRAPH_BEFORE_INFOBOX
 	 */
 	const SHOW_FIRST_PARAGRAPH_BEFORE_INFOBOX = 'showFirstParagraphBeforeInfobox';
 
 	/**
 	 * Constructor
 	 *
 	 * @param string $html Text to process
 	 * @param Title $title Title to which $html belongs
 	 */
 	public function __construct( $html, $title ) {
 		parent::__construct( $html );
 
 		$this->title = $title;
 		$this->revId = $title->getLatestRevID();
 		$this->topHeadingTags = MobileContext::singleton()
 			->getMFConfig()->get( 'MFMobileFormatterHeadings' );
 	}
 
 	/**
 	 * Disables the generation of script tags in output HTML.
 	 */
 	public function disableScripts() {
 		$this->scriptsEnabled = false;
 	}
 	/**
 	 * Creates and returns a MobileFormatter
 	 *
 	 * @param MobileContext $context
 	 * @param string $html
 	 *
 	 * @return MobileFormatter
 	 */
 	public static function newFromContext( MobileContext $context, $html ) {
 		$mfSpecialCaseMainPage = $context->getMFConfig()->get( 'MFSpecialCaseMainPage' );
 
 		$title = $context->getTitle();
 		$isMainPage = $title->isMainPage() && $mfSpecialCaseMainPage;
 		$isFilePage = $title->inNamespace( NS_FILE );
 		$isSpecialPage = $title->isSpecialPage();
 
 		$html = self::wrapHTML( $html );
 		$formatter = new MobileFormatter( $html, $title );
 		$formatter->enableExpandableSections( !$isMainPage && !$isSpecialPage );
 
 		$formatter->setIsMainPage( $isMainPage );
 		if ( $context->getContentTransformations() && !$isFilePage ) {
 			$formatter->setRemoveMedia( $context->imagesDisabled() );
 		}
 
 		return $formatter;
 	}
 
 	/**
 	 * Mark whether a placeholder table of contents should be included at the end of the lead
 	 * section
 	 * @param boolean $flag
 	 */
 	public function enableTOCPlaceholder( $flag = true ) {
 		$this->isTOCEnabled = $flag;
 	}
 
 	/**
 	 * Set support of page for expandable sections to $flag (standard: true)
 	 * @todo kill with fire when there will be minimum of pre-1.1 app users remaining
 	 * @param bool $flag
 	 */
 	public function enableExpandableSections( $flag = true ) {
 		$this->expandableSections = $flag;
 	}
 
 	/**
 	 * Change mainPage (is this the main page) to $value (standard: true)
 	 * @param boolean $value
 	 */
 	public function setIsMainPage( $value = true ) {
 		$this->mainPage = $value;
 	}
 
 	/**
 	 * Performs various transformations to the content to make it appropiate for mobile devices.
 	 * @param bool $removeDefaults Whether default settings at $wgMFRemovableClasses should be used
 	 * @param bool $removeReferences Whether to remove references from the output
 	 * @param bool $removeImages Whether to move images into noscript tags
 	 * @param bool $showFirstParagraphBeforeInfobox Whether the first paragraph from the lead
 	 *  section should be shown before all infoboxes that come earlier.
 	 * @return array
 	 */
 	public function filterContent(
 		$removeDefaults = true, $removeReferences = false, $removeImages = false,
 		$showFirstParagraphBeforeInfobox = false
 	) {
 		$ctx = MobileContext::singleton();
 		$config = $ctx->getMFConfig();
 		$doc = $this->getDoc();
 
 		$isSpecialPage = $this->title->isSpecialPage();
 		$mfRemovableClasses = $config->get( 'MFRemovableClasses' );
 		$removableClasses = $mfRemovableClasses['base'];
 		if ( $ctx->isBetaGroupMember() ) {
 			$removableClasses = array_merge( $removableClasses, $mfRemovableClasses['beta'] );
 		}
 
 		// Don't remove elements in special pages
 		if ( !$isSpecialPage && $removeDefaults ) {
 			$this->remove( $removableClasses );
 		}
 
 		if ( $this->removeMedia ) {
 			$this->doRemoveImages();
 		}
 
 		$transformOptions = [
 			'images' => $removeImages,
 			'references' => $removeReferences,
 			self::SHOW_FIRST_PARAGRAPH_BEFORE_INFOBOX => $showFirstParagraphBeforeInfobox
 		];
 		// Sectionify the content and transform it if necessary per section
 		if ( !$this->mainPage && $this->expandableSections ) {
 			list( $headings, $subheadings ) = $this->getHeadings( $doc );
 			$this->makeSections( $doc, $headings, $transformOptions );
 			$this->makeHeadingsEditable( $subheadings );
 		} else {
 			// Otherwise apply the per-section transformations to the document as a whole
 			$this->filterContentInSection( $doc, $doc, 0, $transformOptions );
 		}
 		if ( $transformOptions['references'] ) {
 			$this->doRewriteReferencesLinksForLazyLoading( $doc );
 		}
 
 		return parent::filterContent();
 	}
 
 	/**
 	 * Apply filtering per element (section) in a document.
 	 * @param DOMElement|DOMDocument $el
 	 * @param DOMDocument $doc
 	 * @param number $sectionNumber Which section is it on the document
 	 * @param array $options options about the transformations per section
 	 */
 	private function filterContentInSection(
 		$el, DOMDocument $doc, $sectionNumber, $options = []
 	) {
 		if ( !$this->removeMedia && $options['images'] && $sectionNumber > 0 ) {
 			$this->doRewriteImagesForLazyLoading( $el, $doc );
 		}
 		if ( $options['references'] ) {
 			$this->doRewriteReferencesListsForLazyLoading( $el, $doc );
 		}
 	}
 
 	/**
 	 * Move the first paragraph in the lead section above the infobox
 	 *
 	 * In order for a paragraph to be moved the following conditions must be met:
 	 *   - the lead section contains at least one infobox;
 	 *   - the paragraph doesn't already appear before the first infobox
 	 *     if any in the DOM;
 	 *   - the paragraph contains text content, e.g. no <p></p>;
 	 *   - the paragraph doesn't contain coordinates, i.e. span#coordinates.
 	 *
 	 * Note that the first paragraph is not moved before hatnotes, or mbox or other
 	 * elements that are not infoboxes.
 	 *
 	 * @param DOMElement $leadSectionBody
 	 * @param DOMDocument $doc Document to which the section belongs
 	 */
 	private function moveFirstParagraphBeforeInfobox( $leadSectionBody, $doc ) {
 		$xPath = new DOMXPath( $doc );
 		// Find infoboxes and paragraphs that have text content, i.e. paragraphs
 		// that are not empty nor are wrapper paragraphs that contain span#coordinates.
 		$infoboxAndParagraphs = $xPath->query(
 			'./table[contains(@class,"infobox")] | ./p[string-length(text()) > 0]',
 			$leadSectionBody
 		);
 		// We need both an infobox and a paragraph and the first element of our query result
 		// ought to be an infobox.
 		if ( $infoboxAndParagraphs->length >= 2 &&
 			$infoboxAndParagraphs->item( 0 )->nodeName == 'table'
 		) {
 			$firstP = null;
 			for ( $i = 1; $i < $infoboxAndParagraphs->length; $i++ ) {
 				if ( $infoboxAndParagraphs->item( $i )->nodeName == 'p' ) {
 					$firstP = $infoboxAndParagraphs->item( $i );
 					break;
 				}
 			}
 			if ( $firstP ) {
 				$leadSectionBody->insertBefore( $firstP, $infoboxAndParagraphs->item( 0 ) );
 			}
 		}
 		/**
 		 * @see https://phabricator.wikimedia.org/T149884
 		 * @todo remove after research is done
 		 */
 		if ( MobileContext::singleton()->getMFConfig()->get( 'MFLogWrappedInfoboxes' ) ) {
 			$this->logInfoboxesWrappedInContainers( $leadSectionBody, $xPath );
 		}
 	}
 
 	/**
 	 * Finds all infoboxes which are one or more levels deep in $xPath content. When at least one
 	 * element is found - log the page title and revision
 	 *
 	 * @see https://phabricator.wikimedia.org/T149884
 	 * @param $leadSectionBody
 	 * @param DOMXPath $xPath
 	 */
 	private function logInfoboxesWrappedInContainers( $leadSectionBody, DOMXPath $xPath ) {
 		$infoboxes = $xPath->query( './/table[contains(@class,"infobox")]', $leadSectionBody );
 		if ( $infoboxes->length > 0 ) {
-			\MediaWiki\Logger\LoggerFactory::getInstance( 'MobileFrontend' )->debug(
+			\MediaWiki\Logger\LoggerFactory::getInstance( 'mobile' )->debug(
 				"Found infobox wrapped with container on {$this->title} (rev:{$this->revId})"
 			);
 		}
 	}
 	/**
 	 * Replaces any references links with a link to Special:MobileCite
 	 *
 	 * @param DOMDocument $doc Document to create and replace elements in
 	 */
 	private function doRewriteReferencesLinksForLazyLoading( DOMDocument $doc ) {
 		$citePath = "$this->revId";
 
 		$xPath = new DOMXPath( $doc );
 		$nodes = $xPath->query(
 			// sup.reference > a
 			'//sup[contains(concat(" ", normalize-space(./@class), " "), " reference ")]/a[1]' );
 
 		foreach ( $nodes as $node ) {
 			$fragment = $node->getAttribute( 'href' );
 			$node->setAttribute(
 				'href',
 				SpecialPage::getTitleFor( 'MobileCite', $citePath )->getLocalUrl() . $fragment
 			);
 		}
 	}
 
 	/**
 	 * Replaces any references list with a link to Special:MobileCite
 	 *
 	 * @param DOMElement|DOMDocument $el Element or document to rewrite references in.
 	 * @param DOMDocument $doc Document to create elements in
 	 */
 	private function doRewriteReferencesListsForLazyLoading( $el, DOMDocument $doc ) {
 		$citePath = "$this->revId";
 		$isReferenceSection = false;
 
 		// Accessing by tag is cheaper than class
 		$nodes = $el->getElementsByTagName( 'ol' );
 		// PHP's DOM classes are recursive
 		// but since we are manipulating the DOMList we have to
 		// traverse it backwards
 		// see http://php.net/manual/en/class.domnodelist.php
 		for ( $i = $nodes->length - 1; $i >= 0; $i-- ) {
 			$list = $nodes->item( $i );
 
 			// Use class to decide it is a list of references
 			if ( strpos( $list->getAttribute( 'class' ), 'references' ) !== false ) {
 
 				// Only mark the section as a reference container if we're transforming a section, not the
 				// document.
 				$isReferenceSection = $el instanceof DOMElement;
 
 				$parent = $list->parentNode;
 				$placeholder = $doc->createElement( 'a',
 					wfMessage( 'mobile-frontend-references-list' ) );
 				$placeholder->setAttribute( 'class', 'mf-lazy-references-placeholder' );
 				// Note to render a reference we need to know only its reference
 				// Note: You can have multiple <references> tag on the same page, we render all of these in
 				// the special page together.
 				$placeholder->setAttribute( 'href',
 					SpecialPage::getTitleFor( 'MobileCite', $citePath )->getLocalUrl() );
 				$parent->replaceChild( $placeholder, $list );
 			}
 		}
 
 		// Mark section as having references
 		if ( $isReferenceSection ) {
 			$el->setAttribute( 'data-is-reference-section', '1' );
 		}
 	}
 
 	/**
 	 * @see MobileFormatter#getImageDimensions
 	 *
 	 * @param DOMElement $img
 	 * @param string $dimension Either "width" or "height"
 	 * @return string|null
 	 */
 	private function getImageDimension( DOMElement $img, $dimension ) {
 		$style = $img->getAttribute( 'style' );
 		$numMatches = preg_match( "/.*?{$dimension} *\: *([^;]*)/", $style, $matches );
 
 		if ( !$numMatches && !$img->hasAttribute( $dimension ) ) {
 			return null;
 		}
 
 		return $numMatches
 			? trim( $matches[1] )
 			: $img->getAttribute( $dimension ) . 'px';
 	}
 
 	/**
 	 * Determine the user perceived width and height of an image element based on `style`, `width`,
 	 * and `height` attributes.
 	 *
 	 * As in the browser, the `style` attribute takes precedence over the `width` and `height`
 	 * attributes. If the image has no `style`, `width` or `height` attributes, then the image is
 	 * dimensionless.
 	 *
 	 * @param DOMElement $img
 	 * @return array with width and height parameters if dimensions are found
 	 */
 	public function getImageDimensions( DOMElement $img ) {
 		$result = [];
 
 		foreach ( [ 'width', 'height' ] as $dimensionName ) {
 			$dimension = $this->getImageDimension( $img, $dimensionName );
 
 			if ( $dimension ) {
 				$result[$dimensionName] = $dimension;
 			}
 		}
 
 		return $result;
 	}
 
 	/**
 	 * Enables images to be loaded asynchronously
 	 *
 	 * @param DOMElement|DOMDocument $el Element or document to rewrite images in.
 	 * @param DOMDocument $doc Document to create elements in
 	 */
 	private function doRewriteImagesForLazyLoading( $el, DOMDocument $doc ) {
 
 		foreach ( $el->getElementsByTagName( 'img' ) as $img ) {
 			$parent = $img->parentNode;
 			$dimensions = $this->getImageDimensions( $img );
 
 			$dimensionsStyle = ( isset( $dimensions['width'] ) ? "width: {$dimensions['width']};" : '' ) .
 				( isset( $dimensions['height'] ) ? "height: {$dimensions['height']};" : '' );
 
 			// HTML only clients
 			$noscript = $doc->createElement( 'noscript' );
 
 			// To be loaded image placeholder
 			$imgPlaceholder = $doc->createElement( 'span' );
 			$imgPlaceholder->setAttribute( 'class', 'lazy-image-placeholder' );
 			$imgPlaceholder->setAttribute( 'style', $dimensionsStyle );
 			foreach ( [ 'src', 'alt', 'width', 'height', 'srcset', 'class' ] as $attr ) {
 				if ( $img->hasAttribute( $attr ) ) {
 					$imgPlaceholder->setAttribute( "data-$attr", $img->getAttribute( $attr ) );
 				}
 			}
 			// Assume data saving and remove srcset attribute from the non-js experience
 			$img->removeAttribute( 'srcset' );
 
 			// T145222: Add a non-breaking space inside placeholders to ensure that they do not report
 			// themselves as invisible when inline.
 			$imgPlaceholder->appendChild( $doc->createEntityReference( 'nbsp' ) );
 
 			// Set the placeholder where the original image was
 			$parent->replaceChild( $imgPlaceholder, $img );
 			// Add the original image to the HTML only markup
 			$noscript->appendChild( $img );
 			// Insert the HTML only markup before the placeholder
 			$parent->insertBefore( $noscript, $imgPlaceholder );
 		}
 	}
 
 	/**
 	 * Replaces images with [annotations from alt]
 	 */
 	private function doRemoveImages() {
 		$doc = $this->getDoc();
 		$domElemsToReplace = [];
 		foreach ( $doc->getElementsByTagName( 'img' ) as $element ) {
 			$domElemsToReplace[] = $element;
 		}
 		/** @var $element DOMElement */
 		foreach ( $domElemsToReplace as $element ) {
 			$alt = $element->getAttribute( 'alt' );
 			if ( $alt === '' ) {
 				$alt = '[' . wfMessage( 'mobile-frontend-missing-image' )->inContentLanguage() . ']';
 			} else {
 				$alt = '[' . $alt . ']';
 			}
 			$replacement = $doc->createElement( 'span', htmlspecialchars( $alt ) );
 			$replacement->setAttribute( 'class', 'mw-mf-image-replacement' );
 			$element->parentNode->replaceChild( $replacement, $element );
 		}
 	}
 
 	/**
 	 * Performs final transformations to mobile format and returns resulting HTML
 	 *
 	 * @param DOMElement|string|null $element ID of element to get HTML from or
 	 *   false to get it from the whole tree
 	 * @return string Processed HTML
 	 */
 	public function getText( $element = null ) {
 		if ( $this->mainPage ) {
 			$element = $this->parseMainPage( $this->getDoc() );
 		}
 
 		return parent::getText( $element );
 	}
 
 	/**
 	 * Returns interface message text
 	 * @param string $key Message key
 	 * @return string Wiki text
 	 */
 	protected function msg( $key ) {
 		return wfMessage( $key )->text();
 	}
 
 	/**
 	 * Performs transformations specific to main page
 	 * @param DOMDocument $mainPage Tree to process
 	 * @return DOMElement|null
 	 */
 	protected function parseMainPage( DOMDocument $mainPage ) {
 		$featuredArticle = $mainPage->getElementById( 'mp-tfa' );
 		$newsItems = $mainPage->getElementById( 'mp-itn' );
 		$centralAuthImages = $mainPage->getElementById( 'central-auth-images' );
 
 		// Collect all the Main Page DOM elements that have an id starting with 'mf-'
 		$xpath = new DOMXpath( $mainPage );
 		$elements = $xpath->query( '//*[starts-with(@id, "mf-")]' );
 
 		// These elements will be handled specially
 		$commonAttributes = [ 'mp-tfa', 'mp-itn' ];
 
 		// Start building the new Main Page content in the $content var
 		$content = $mainPage->createElement( 'div' );
 		$content->setAttribute( 'id', 'mainpage' );
 
 		// If there is a featured article section, add it to the new Main Page content
 		if ( $featuredArticle ) {
 			$h2FeaturedArticle = $mainPage->createElement(
 				'h2',
 				$this->msg( 'mobile-frontend-featured-article' )
 			);
 			$content->appendChild( $h2FeaturedArticle );
 			$content->appendChild( $featuredArticle );
 		}
 
 		// If there is a news section, add it to the new Main Page content
 		if ( $newsItems ) {
 			$h2NewsItems = $mainPage->createElement( 'h2', $this->msg( 'mobile-frontend-news-items' ) );
 			$content->appendChild( $h2NewsItems );
 			$content->appendChild( $newsItems );
 		}
 
 		// Go through all the collected Main Page DOM elements and format them for mobile
 		/** @var $element DOMElement */
 		foreach ( $elements as $element ) {
 			if ( $element->hasAttribute( 'id' ) ) {
 				$id = $element->getAttribute( 'id' );
 				// Filter out elements processed specially
 				if ( !in_array( $id, $commonAttributes ) ) {
 					// Convert title attributes into h2 headers
 					$sectionTitle = $element->hasAttribute( 'title' ) ? $element->getAttribute( 'title' ) : '';
 					if ( $sectionTitle !== '' ) {
 						$element->removeAttribute( 'title' );
 						$h2UnknownMobileSection =
 							$mainPage->createElement( 'h2', htmlspecialchars( $sectionTitle ) );
 						$content->appendChild( $h2UnknownMobileSection );
 					}
 					$br = $mainPage->createElement( 'br' );
 					$br->setAttribute( 'clear', 'all' );
 					$content->appendChild( $element );
 					$content->appendChild( $br );
 				}
 			}
 		}
 
 		// If no mobile-appropriate content has been assembled at this point, return null.
 		// This will cause HtmlFormatter to fall back to using the entire page.
 		if ( $content->childNodes->length == 0 ) {
 			return null;
 		}
 
 		// If there are CentralAuth 1x1 images, preserve them unmodified
 		if ( $centralAuthImages ) {
 			$content->appendChild( $centralAuthImages );
 		}
 
 		return $content;
 	}
 
 	/**
 	 * Splits the body of the document into sections demarcated by the $headings elements.
 	 * Also moves the first paragraph in the lead section above the infobox.
 	 *
 	 * All member elements of the sections are added to a <code><div></code> so
 	 * that the section bodies are clearly defined (to be "expandable" for
 	 * example).
 	 *
 	 * @param DOMDocument $doc
 	 * @param [DOMElement] $headings The headings returned by
 	 *  {@see MobileFormatter::getHeadings}
 	 * @param array $transformOptions Options to pass when transforming content per section
 	 */
 	protected function makeSections( DOMDocument $doc, array $headings, $transformOptions ) {
 
 		$body = $doc->getElementsByTagName( 'body' )->item( 0 );
 		$sibling = $body->firstChild;
 
 		$firstHeading = reset( $headings );
 
 		$sectionNumber = 0;
 		$sectionBody = $this->createSectionBodyElement( $doc, $sectionNumber, false );
 		$this->prepareHeadings( $doc, $headings, $this->scriptsEnabled );
 
 		while ( $sibling ) {
 			$node = $sibling;
 			$sibling = $sibling->nextSibling;
 
 			// If we've found a top level heading, insert the previous section if
 			// necessary and clear the container div.
 			// Note well the use of DOMNode#nodeName here. Only DOMElement defines
 			// DOMElement#tagName.  So, if there's trailing text - represented by
 			// DOMText - then accessing #tagName will trigger an error.
 			if ( $headings && $node->nodeName === $firstHeading->nodeName ) {
 				if ( $sectionBody->hasChildNodes() ) {
 					// Apply transformations to the section body
 					$this->filterContentInSection( $sectionBody, $doc, $sectionNumber, $transformOptions );
 				}
 				// Insert the previous section body and reset it for the new section
 				$body->insertBefore( $sectionBody, $node );
 
 				if ( $sectionNumber === 0 ) {
 					if ( $this->isTOCEnabled ) {
 						// Insert table of content placeholder which will be progressively enhanced via JS
 						$toc = $doc->createElement( 'div' );
 						$toc->setAttribute( 'id', 'toc' );
 						$toc->setAttribute( 'class', 'toc-mobile' );
 						$tocHeading = $doc->createElement( 'h2', wfMessage( 'toc' )->text() );
 						$toc->appendChild( $tocHeading );
 						$sectionBody->appendChild( $toc );
 					}
 					if ( $transformOptions[ self::SHOW_FIRST_PARAGRAPH_BEFORE_INFOBOX ] ) {
 						$this->moveFirstParagraphBeforeInfobox( $sectionBody, $doc );
 					}
 				}
 				$sectionNumber += 1;
 				$sectionBody = $this->createSectionBodyElement( $doc, $sectionNumber, $this->scriptsEnabled );
 				continue;
 			}
 
 			// If it is not a top level heading, keep appending the nodes to the
 			// section body container.
 			$sectionBody->appendChild( $node );
 		}
 
 		// If the document had the lead section only:
 		if ( $sectionNumber == 0 && $transformOptions[ self::SHOW_FIRST_PARAGRAPH_BEFORE_INFOBOX ] ) {
 			$this->moveFirstParagraphBeforeInfobox( $sectionBody, $doc );
 		}
 
 		if ( $sectionBody->hasChildNodes() ) {
 			// Apply transformations to the last section body
 			$this->filterContentInSection( $sectionBody, $doc, $sectionNumber, $transformOptions );
 		}
 		// Append the last section body.
 		$body->appendChild( $sectionBody );
 	}
 
 	/**
 	 * Prepare section headings, add required classes and onclick actions
 	 *
 	 * @param DOMDocument $doc
 	 * @param array $headings
 	 * @param bool $isCollapsible
 	 */
 	private function prepareHeadings( DOMDocument $doc, array $headings, $isCollapsible ) {
 		$sectionNumber = 0;
 		// Mark the top level headings which could control collapsing
 		foreach ( $headings as $heading ) {
 			$sectionNumber += 1;
 			$className = $heading->hasAttribute( 'class' ) ? $heading->getAttribute( 'class' ) . ' ' : '';
 			$heading->setAttribute( 'class', $className . 'section-heading' );
 			if ( $isCollapsible ) {
 				$heading->setAttribute( 'onclick', 'javascript:mfTempOpenSection(' . $sectionNumber . ')' );
 			}
 
 			// prepend indicator
 			$indicator = $doc->createElement( 'div' );
 			$indicator->setAttribute( 'class', MobileUI::iconClass( '', 'element', 'indicator' ) );
 			$heading->insertBefore( $indicator, $heading->firstChild );
 		}
 	}
 
 	/**
 	 * Creates a Section body element
 	 *
 	 * @param DOMDocument $doc
 	 * @param int $sectionNumber
 	 * @param bool $isCollapsible
 	 *
 	 * @return DOMElement
 	 */
 	private function createSectionBodyElement( DOMDocument $doc, $sectionNumber, $isCollapsible ) {
 		$sectionClass = 'mf-section-' . $sectionNumber;
 		if ( $isCollapsible ) {
 			// TODO: Probably good to rename this to the more generic 'section'.
 			// We have no idea how the skin will use this.
 			$sectionClass .= ' ' . self::STYLE_COLLAPSIBLE_SECTION_CLASS;
 		}
 
 		// FIXME: The class `/mf\-section\-[0-9]+/` is kept for caching reasons
 		// but given class is unique usage is discouraged. [T126825]
 		$sectionBody = $doc->createElement( 'div' );
 		$sectionBody->setAttribute( 'class', $sectionClass );
 		$sectionBody->setAttribute( 'id', 'mf-section-' . $sectionNumber );
 		return $sectionBody;
 	}
 
 	/**
 	 * Marks the headings as editable by adding the <code>in-block</code>
 	 * class to each of them, if it hasn't already been added.
 	 *
 	 * FIXME: <code>in-block</code> isn't semantic in that it isn't
 	 * obviously connected to being editable.
 	 *
 	 * @param [DOMElement] $headings
 	 */
 	protected function makeHeadingsEditable( array $headings ) {
 		foreach ( $headings as $heading ) {
 			$class = $heading->getAttribute( 'class' );
 
 			if ( strpos( $class, 'in-block' ) === false ) {
 				$heading->setAttribute(
 					'class',
 					ltrim( $class . ' in-block' )
 				);
 			}
 		}
 	}
 
 	/**
 	 * Gets all headings in the document in rank order.
 	 *
 	 * Note well that the rank order is defined by the
 	 * <code>MobileFormatter#topHeadingTags</code> property.
 	 *
 	 * @param DOMDocument $doc
 	 * @return array A two-element array where the first is the highest
 	 *  rank headings and the second is all other headings
 	 */
 	private function getHeadings( DOMDocument $doc ) {
 		$headings = $subheadings = [];
 
 		foreach ( $this->topHeadingTags as $tagName ) {
 			$elements = $doc->getElementsByTagName( $tagName );
 
 			if ( !$elements->length ) {
 				continue;
 			}
 
 			// TODO: Under HHVM 3.6.6, `iterator_to_array` returns a one-indexed
 			// array rather than a zero-indexed array.  Create a minimal test case
 			// and raise a bug.
 			// FIXME: Remove array_values when HHVM bug fixed.
 			$elements = array_values( iterator_to_array( $elements ) );
 
 			if ( !$headings ) {
 				$headings = $elements;
 			} else {
 				$subheadings = array_merge( $subheadings, $elements );
 			}
 		}
 
 		return [ $headings, $subheadings ];
 	}
 }
diff --git a/tests/phpunit/MobileFormatterTest.php b/tests/phpunit/MobileFormatterTest.php
index 05773fc0c..1e2973ca1 100644
--- a/tests/phpunit/MobileFormatterTest.php
+++ b/tests/phpunit/MobileFormatterTest.php
@@ -1,852 +1,852 @@
 <?php
 
 /**
  * @group MobileFrontend
  */
 class MobileFormatterTest extends MediaWikiTestCase {
 	const TOC = '<div id="toc" class="toc-mobile"><h2>Contents</h2></div>';
 	const SECTION_INDICATOR = '<div class="mw-ui-icon mw-ui-icon-element indicator"></div>';
 	const HATNOTE_CLASSNAME = 'hatnote';
 	const INFOBOX_CLASSNAME = 'infobox';
 
 	/**
 	 * Helper function that creates section headings from a heading and title
 	 *
 	 * @param string $heading
 	 * @param string $innerHtml of the heading element
 	 * @param integer [$sectionNumber] heading corresponds to
 	 * @return string
 	 */
 	private function makeSectionHeading( $heading, $innerHtml, $sectionNumber = 1 ) {
 		return "<$heading class=\"section-heading\""
 			. " onclick=\"javascript:mfTempOpenSection($sectionNumber)\">"
 			. self::SECTION_INDICATOR
 			. "$innerHtml</$heading>";
 	}
 
 	/**
 	 * Helper function that creates sections from section number and content HTML.
 	 *
 	 * @param string $sectionNumber
 	 * @param string $contentHtml
 	 * @param boolean $isReferenceSection whether the section contains references
 	 * @return string
 	 */
 	private function makeSectionHtml( $sectionNumber, $contentHtml = '',
 		$isReferenceSection = false
 	) {
 		$attrs = $isReferenceSection ? ' data-is-reference-section="1"' : '';
 		$className = "mf-section-$sectionNumber";
 
 		if ( $sectionNumber > 0 ) {
 			$className = $className . ' ' . MobileFormatter::STYLE_COLLAPSIBLE_SECTION_CLASS;
 		}
 
 		return "<div class=\"$className\" id=\"mf-section-$sectionNumber\""
 			. "$attrs>$contentHtml</div>";
 	}
 
 	/**
 	 * @dataProvider provideHtmlTransform
 	 *
 	 * @param $input
 	 * @param $expected
 	 * @param callable|bool $callback
 	 * @param bool $removeDefaults
 	 * @param bool $lazyLoadReferences
 	 * @param bool $lazyLoadImages
 	 * @param bool $showFirstParagraphBeforeInfobox
 	 * @covers MobileFormatter::filterContent
 	 * @covers MobileFormatter::doRemoveImages
 	 */
 	public function testHtmlTransform( $input, $expected, $callback = false,
 		$removeDefaults = false, $lazyLoadReferences = false, $lazyLoadImages = false,
 		$showFirstParagraphBeforeInfobox = false
 	) {
 		$t = Title::newFromText( 'Mobile' );
 		$input = str_replace( "\r", '', $input ); // "yay" to Windows!
 		$mf = new MobileFormatter( MobileFormatter::wrapHTML( $input ), $t );
 		if ( $callback ) {
 			$callback( $mf );
 		}
 		$mf->topHeadingTags = [ 'h1', 'h2', 'h3', 'h4', 'h5', 'h6' ];
 		$mf->filterContent( $removeDefaults, $lazyLoadReferences, $lazyLoadImages,
 			$showFirstParagraphBeforeInfobox );
 		$html = $mf->getText();
 		$this->assertEquals( str_replace( "\n", '', $expected ), str_replace( "\n", '', $html ) );
 	}
 
 	public function provideHtmlTransform() {
 		$enableSections = function ( MobileFormatter $mf ) {
 			$mf->enableExpandableSections();
 		};
 		$longLine = "\n" . str_repeat( 'A', 5000 );
 		$removeImages = function( MobileFormatter $f ) {
 			$f->setRemoveMedia();
 		};
 		$mainPage = function( MobileFormatter $f ) {
 			$f->setIsMainPage( true );
 		};
 		$citeUrl = SpecialPage::getTitleFor( 'MobileCite', '0' )->getLocalUrl();
 		$imageStyles = '<img src="math.jpg" style="vertical-align: -3.505ex; '
 			. 'width: 24.412ex; height:7.343ex; background:none;">';
 		$placeholderStyles = '<span class="lazy-image-placeholder" '
 			. 'style="width: 24.412ex;height: 7.343ex;" '
 			. 'data-src="math.jpg">'
 			. ' '
 			. '</span>';
 		$noscriptStyles = '<noscript>' . $imageStyles . '</noscript>';
 		$originalImage = '<img alt="foo" src="foo.jpg" width="100" '
 			. 'height="100" srcset="foo-1.5x.jpg 1.5x, foo-2x.jpg 2x">';
 		$placeholder = '<span class="lazy-image-placeholder" '
 			. 'style="width: 100px;height: 100px;" '
 			. 'data-src="foo.jpg" data-alt="foo" data-width="100" data-height="100" '
 			. 'data-srcset="foo-1.5x.jpg 1.5x, foo-2x.jpg 2x">'
 			. ' '
 			. '</span>';
 		$noscript = '<noscript><img alt="foo" src="foo.jpg" width="100" height="100"></noscript>';
 		$refText = '<p>They saved the world with one single unit test'
 			. '<sup class="reference"><a href="#cite-note-1">[1]</a></sup></p>';
 		$expectedReftext = '<p>They saved the world with one single unit test'
 			. '<sup class="reference"><a href="' . $citeUrl . '#cite-note-1">[1]</a></sup></p>';
 		$refhtml = '<ol class="references"><li>link 1</li><li>link 2</li></ol>';
 		$refplaceholder = Html::element( 'a',
 			[
 				'class' => 'mf-lazy-references-placeholder',
 				'href' => $citeUrl,
 			],
 			wfMessage( 'mobile-frontend-references-list' )
 		);
 		$refSectionHtml = $this->makeSectionHeading( 'h2', 'references' )
 			. $this->makeSectionHtml( 1, $refplaceholder, true );
 
 		return [
 			// # Lazy loading images
 			// Main page not impacted
 			[
 				'<div>a</div><h2>Today</h2>' . $originalImage . '<h2>Tomorrow</h2>Test.',
 				'<div>a</div><h2>Today</h2>' . $originalImage . '<h2>Tomorrow</h2>Test.',
 				$mainPage,
 				false, false, true,
 			],
 			// Lead section images not impacted
 			[
 				'<p>' . $originalImage . '</p><h2>heading 1</h2><p>text</p>'
 					. '<h2>heading 2</h2>abc',
 				$this->makeSectionHtml( 0, '<p>' . $originalImage . '</p>' )
 					. $this->makeSectionHeading( 'h2', 'heading 1' )
 					. $this->makeSectionHtml( 1, '<p>text</p>' )
 					. $this->makeSectionHeading( 'h2', 'heading 2', 2 )
 					. $this->makeSectionHtml( 2, 'abc' ),
 				$enableSections,
 				false, false, true,
 			],
 			// Test lazy loading of images outside the lead section
 			[
 				'<p>text</p><h2>heading 1</h2><p>text</p>' . $originalImage
 					. '<h2>heading 2</h2>abc',
 					$this->makeSectionHtml( 0, '<p>text</p>' )
 					. $this->makeSectionHeading( 'h2', 'heading 1' )
 					. $this->makeSectionHtml( 1,
 						'<p>text</p>' . $noscript . $placeholder
 					)
 					. $this->makeSectionHeading( 'h2', 'heading 2', 2 )
 					. $this->makeSectionHtml( 2, 'abc' ),
 				$enableSections,
 				false, false, true,
 			],
 			// Test lazy loading of images with style attributes
 			[
 				'<p>text</p><h2>heading 1</h2><p>text</p>' . $imageStyles
 					. '<h2>heading 2</h2>abc',
 				$this->makeSectionHtml( 0, '<p>text</p>' )
 					. $this->makeSectionHeading( 'h2', 'heading 1' )
 					. $this->makeSectionHtml( 1,
 						'<p>text</p>' . $noscriptStyles . $placeholderStyles
 					)
 					. $this->makeSectionHeading( 'h2', 'heading 2', 2 )
 					. $this->makeSectionHtml( 2, 'abc' ),
 				$enableSections,
 				false, false, true,
 			],
 			// https://phabricator.wikimedia.org/T130025, last section filtered
 			[
 				'<p>text</p><h2>heading 1</h2><p>text</p>' . $originalImage
 				.'<h2>heading 2</h2>' . $originalImage,
 				$this->makeSectionHtml( 0, '<p>text</p>' )
 					. $this->makeSectionHeading( 'h2', 'heading 1' )
 					. $this->makeSectionHtml( 1,
 						'<p>text</p>' . $noscript . $placeholder
 					)
 					. $this->makeSectionHeading( 'h2', 'heading 2', 2 )
 					. $this->makeSectionHtml( 2, $noscript . $placeholder ),
 				$enableSections,
 				false, false, true,
 			],
 
 			// # Lazy loading references
 			[
 				$refText
 					. '<h2>references</h2>' . $refhtml,
 				$this->makeSectionHtml( 0, $expectedReftext ) . $refSectionHtml,
 				$enableSections,
 				false, true, false
 			],
 
 			// T135923: Note the whitespace immediately inside the `sup` element.
 			[
 				'<p>T135923 <sup class="reference">    <a href="#cite-note-1">[1]</a></sup></p>'
 					. '<h2>references</h2>' . $refhtml,
 				$this->makeSectionHtml( 0, '<p>T135923 <sup class="reference">    '
 					. '<a href="' . $citeUrl
 					. '#cite-note-1">[1]</a></sup></p>'
 				)
 					. $refSectionHtml,
 				$enableSections,
 				false, true, false
 			],
 			// Empty reference class
 			[
 				'<p>T135923 <sup class="reference"></sup></p>'
 					. '<h2>references</h2>' . $refhtml,
 				$this->makeSectionHtml( 0,
 					'<p>T135923 <sup class="reference"></sup></p>'
 				) . $refSectionHtml,
 				$enableSections,
 				false, true, false
 			],
 
 			// # Removal of images
 			[
 				'<img src="/foo/bar.jpg" alt="Blah"/>',
 				'<span class="mw-mf-image-replacement">[Blah]</span>',
 				$removeImages,
 			],
 			[
 				'<img alt="picture of kitty" src="kitty.jpg">',
 				'<span class="mw-mf-image-replacement">' .
 				'[picture of kitty]</span>',
 				$removeImages,
 			],
 			[
 				'<img src="kitty.jpg">',
 				'<span class="mw-mf-image-replacement">[' .
 					wfMessage( 'mobile-frontend-missing-image' ) . ']</span>',
 				$removeImages,
 			],
 			[
 				'<img alt src="kitty.jpg">',
 				'<span class="mw-mf-image-replacement">[' .
 					wfMessage( 'mobile-frontend-missing-image' ) . ']</span>',
 				$removeImages,
 			],
 			[
 				'<img alt src="kitty.jpg">look at the cute kitty!' .
 					'<img alt="picture of angry dog" src="dog.jpg">',
 				'<span class="mw-mf-image-replacement">[' .
 					wfMessage( 'mobile-frontend-missing-image' ) . ']</span>look at the cute kitty!' .
 					'<span class="mw-mf-image-replacement">[picture of angry dog]</span>',
 				$removeImages,
 			],
 
 			// # Section wrapping
 			// \n</h2> in headers
 			[
 				'<h2><span class="mw-headline" id="Forty-niners">Forty-niners</span>'
 					. '<a class="edit-page" href="#editor/2">Edit</a></h2>'
 					. $longLine,
 				$this->makeSectionHtml( 0, '' )
 					. $this->makeSectionHeading( 'h2',
 						'<span class="mw-headline" id="Forty-niners">Forty-niners</span>'
 						. '<a class="edit-page" href="#editor/2">Edit</a>'
 					)
 					. $this->makeSectionHtml( 1, $longLine ),
 				$enableSections
 			],
 			// \n</h3> in headers
 			[
 				'<h3><span>h3</span></h3>'
 					. $longLine
 					. '<h4><span>h4</span></h4>'
 					. 'h4 text.',
 				$this->makeSectionHtml( 0, '' )
 					. $this->makeSectionHeading( 'h3', '<span>h3</span>' )
 					. $this->makeSectionHtml( 1, $longLine
 						. '<h4 class="in-block"><span>h4</span></h4>'
 						. 'h4 text.'
 					),
 				$enableSections
 			],
 			// \n</h6> in headers
 			[
 				'<h6><span>h6</span></h6>'
 					. $longLine,
 				$this->makeSectionHtml( 0, '' )
 					. $this->makeSectionHeading( 'h6', '<span>h6</span>' )
 					. $this->makeSectionHtml( 1, $longLine ),
 				$enableSections
 			],
 			// Bug 36670
 			[
 				'<h2><span class="mw-headline" id="History"><span id="Overview"></span>'
 					. 'History</span><a class="edit-page" href="#editor/2">Edit</a></h2>'
 					. $longLine,
 				$this->makeSectionHtml( 0, '' )
 				. $this->makeSectionHeading( 'h2',
 					'<span class="mw-headline" id="History"><span id="Overview"></span>'
 						. 'History</span><a class="edit-page" href="#editor/2">Edit</a>'
 					)
 				. $this->makeSectionHtml( 1, $longLine ),
 				$enableSections
 			],
 
 			// # Main page transformations
 			[
 				'fooo
 				<div id="mp-itn">bar</div>
 				<div id="mf-custom" title="custom">blah</div>',
 				'<div id="mainpage">' .
 				'<h2>In the news</h2><div id="mp-itn">bar</div>'
 					. '<h2>custom</h2><div id="mf-custom">blah</div><br clear="all"></div>',
 				$mainPage,
 			],
 			[
 				'<div id="foo">test</div>',
 				'<div id="foo">test</div>',
 				$mainPage,
 			],
 			[
 				'<div id="mf-foo" title="A &amp; B">test</div>',
 				'<div id="mainpage">' .
 				'<h2>A &amp; B</h2><div id="mf-foo">test</div><br clear="all"></div>',
 				$mainPage,
 			],
 			[
 				'<div id="foo">test</div><div id="central-auth-images">images</div>',
 				'<div id="foo">test' .
 				'</div><div id="central-auth-images">images</div>',
 				$mainPage,
 			],
 			[
 				'<div id="mf-foo" title="A &amp; B">test</div><div id="central-auth-images">images</div>',
 				'<div id="mainpage">' .
 				'<h2>A &amp; B</h2><div id="mf-foo">test</div><br clear="all">'
 					. '<div id="central-auth-images">images</div></div>',
 				$mainPage,
 			],
 
 			// Infobox and the first paragraph in lead section transformations
 			[
 				// no lead section, no infobox, a section
 				'<h2>Heading 1</h2>' .
 				'<p>paragraph 3</p>',
 
 				$this->makeSectionHtml( 0, '' ) .
 				$this->makeSectionHeading( 'h2', 'Heading 1' ) .
 				$this->makeSectionHtml(
 					1,
 					'<p>paragraph 3</p>'
 				),
 
 				$enableSections, false, false, false, true,
 			],
 			[
 				// hat-note, lead section, no infobox, another section
 				'<div class="' . self::HATNOTE_CLASSNAME . '">hatnote</div>' .
 				'<p>paragraph 1</p>' .
 				'<p>paragraph 2</p>' .
 				'<h2>Heading 1</h2>' .
 				'<p>paragraph 3</p>',
 
 				$this->makeSectionHtml(
 					0,
 					'<div class="' . self::HATNOTE_CLASSNAME . '">hatnote</div>' .
 					'<p>paragraph 1</p>' .
 					'<p>paragraph 2</p>'
 				) .
 				$this->makeSectionHeading( 'h2', 'Heading 1' ) .
 				$this->makeSectionHtml(
 					1,
 					'<p>paragraph 3</p>'
 				),
 
 				$enableSections, false, false, false, true,
 			],
 			[
 				// hat-note, lead section, infobox, another section
 				'<div class="' . self::HATNOTE_CLASSNAME . '">hatnote</div>' .
 				'<table class="' . self::INFOBOX_CLASSNAME . '"><tr><td>infobox</td></tr></table>' .
 				'<p>paragraph 1</p>' .
 				'<p>paragraph 2</p>' .
 				'<h2>Heading 1</h2>' .
 				'<p>paragraph 3</p>',
 
 				$this->makeSectionHtml(
 					0,
 					'<div class="' . self::HATNOTE_CLASSNAME . '">hatnote</div>' .
 					'<p>paragraph 1</p>' .
 					'<table class="' . self::INFOBOX_CLASSNAME . '"><tr><td>infobox</td></tr></table>' .
 					'<p>paragraph 2</p>'
 				) .
 				$this->makeSectionHeading( 'h2', 'Heading 1' ) .
 				$this->makeSectionHtml(
 					1,
 					'<p>paragraph 3</p>'
 				),
 
 				$enableSections, false, false, false, true,
 			],
 			[
 				// first paragraph is already before the lead section
 				'<p>paragraph 1</p>' .
 				'<table class="' . self::INFOBOX_CLASSNAME . '"><tr><td>infobox</td></tr></table>' .
 				'<p>paragraph 2</p>' .
 				'<h2>Heading 1</h2>' .
 				'<p>paragraph 3</p>',
 
 				$this->makeSectionHtml(
 					0,
 					'<p>paragraph 1</p>' .
 					'<table class="' . self::INFOBOX_CLASSNAME . '"><tr><td>infobox</td></tr></table>' .
 					'<p>paragraph 2</p>'
 				) .
 				$this->makeSectionHeading( 'h2', 'Heading 1' ) .
 				$this->makeSectionHtml(
 					1,
 					'<p>paragraph 3</p>'
 				),
 
 				$enableSections, false, false, false, true,
 			],
 			[
 				// infobox, but no paragraphs in the lead section
 				'<table class="' . self::INFOBOX_CLASSNAME . '"><tr><td>infobox</td></tr></table>' .
 				'<h2>Heading 1</h2>' .
 				'<p>paragraph 1</p>',
 
 				$this->makeSectionHtml(
 					0,
 					'<table class="' . self::INFOBOX_CLASSNAME . '"><tr><td>infobox</td></tr></table>'
 				) .
 				$this->makeSectionHeading( 'h2', 'Heading 1' ) .
 				$this->makeSectionHtml(
 					1,
 					'<p>paragraph 1</p>'
 				),
 
 				$enableSections, false, false, false, true,
 			],
 			[
 				// no lead section, infobox after the first section
 				'<h2>Heading 1</h2>' .
 				'<p>paragraph 1</p>' .
 				'<table class="' . self::INFOBOX_CLASSNAME . '"><tr><td>infobox</td></tr></table>',
 
 				$this->makeSectionHtml( 0, '' ) .
 				$this->makeSectionHeading( 'h2', 'Heading 1' ) .
 				$this->makeSectionHtml(
 					1,
 					'<p>paragraph 1</p>' .
 					'<table class="' . self::INFOBOX_CLASSNAME . '"><tr><td>infobox</td></tr></table>'
 				),
 
 				$enableSections, false, false, false, true,
 			],
 			[
 				// two infoboxes, lead section, another section
 				'<table class="' . self::INFOBOX_CLASSNAME . '"><tr><td>infobox 1</td></tr></table>' .
 				'<table class="' . self::INFOBOX_CLASSNAME . '"><tr><td>infobox 2</td></tr></table>' .
 				'<p>paragraph 1</p>' .
 				'<h2>Heading 1</h2>' .
 				'<p>paragraph 1</p>',
 
 				$this->makeSectionHtml(
 					0,
 					'<p>paragraph 1</p>' .
 					'<table class="' . self::INFOBOX_CLASSNAME . '"><tr><td>infobox 1</td></tr></table>' .
 					'<table class="' . self::INFOBOX_CLASSNAME . '"><tr><td>infobox 2</td></tr></table>'
 				) .
 				$this->makeSectionHeading( 'h2', 'Heading 1' ) .
 				$this->makeSectionHtml(
 					1,
 					'<p>paragraph 1</p>'
 				),
 
 				$enableSections, false, false, false, true,
 			],
 			[
 				// first paragraph (which has coordinates and is hidden on mobile),
 				// infobox, lead section
 				'<p><span><span id="coordinates">Coordinates</span></span></p>'.
 				'<table class="' . self::INFOBOX_CLASSNAME . '"><tr><td>infobox</td></tr></table>' .
 				'<p>paragraph 2</p>',
 
 				$this->makeSectionHtml(
 					0,
 					'<p><span><span id="coordinates">Coordinates</span></span></p>'.
 					'<p>paragraph 2</p>' .
 					'<table class="' . self::INFOBOX_CLASSNAME . '"><tr><td>infobox</td></tr></table>'
 				),
 
 				$enableSections, false, false, false, true,
 			],
 			[
 				// hatnote, infobox, thumbnail, lead section, another section
 				'<div class="' . self::HATNOTE_CLASSNAME . '">hatnote</div>' .
 				'<table class="' . self::INFOBOX_CLASSNAME . '"><tr><td>infobox</td></tr></table>' .
 				'<div class="thumb">Thumbnail</div>' .
 				'<p>paragraph 1</p>' .
 				'<p>paragraph 2</p>' .
 				'<h2>Heading 1</h2>' .
 				'<p>paragraph 3</p>',
 
 				$this->makeSectionHtml(
 					0,
 					'<div class="' . self::HATNOTE_CLASSNAME . '">hatnote</div>' .
 					'<p>paragraph 1</p>' .
 					'<table class="' . self::INFOBOX_CLASSNAME . '"><tr><td>infobox</td></tr></table>' .
 					'<div class="thumb">Thumbnail</div>' .
 					'<p>paragraph 2</p>'
 				) .
 				$this->makeSectionHeading( 'h2', 'Heading 1' ) .
 				$this->makeSectionHtml(
 					1,
 					'<p>paragraph 3</p>'
 				),
 
 				$enableSections, false, false, false, true,
 			],
 
 			[
 				// empty first paragraph, infobox, second paragraph, another section
 				'<p></p>' .
 				'<table class="' . self::INFOBOX_CLASSNAME . '"><tr><td>infobox</td></tr></table>' .
 				'<p>paragraph 2</p>' .
 				'<h2>Heading 1</h2>' .
 				'<p>paragraph 3</p>',
 
 				$this->makeSectionHtml(
 					0,
 					'<p></p>' .
 					'<p>paragraph 2</p>' .
 					'<table class="' . self::INFOBOX_CLASSNAME . '"><tr><td>infobox</td></tr></table>'
 				) .
 				$this->makeSectionHeading( 'h2', 'Heading 1' ) .
 				$this->makeSectionHtml(
 					1,
 					'<p>paragraph 3</p>'
 				),
 
 				$enableSections, false, false, false, true,
 			],
 
 			[
 				// infobox, empty first paragraph, second paragraph, another section
 				'<table class="' . self::INFOBOX_CLASSNAME . '"><tr><td>infobox</td></tr></table>' .
 				'<p></p>' .
 				'<p>paragraph 2</p>' .
 				'<h2>Heading 1</h2>' .
 				'<p>paragraph 3</p>',
 
 				$this->makeSectionHtml(
 					0,
 					'<p>paragraph 2</p>' .
 					'<table class="' . self::INFOBOX_CLASSNAME . '"><tr><td>infobox</td></tr></table>' .
 					'<p></p>'
 				) .
 				$this->makeSectionHeading( 'h2', 'Heading 1' ) .
 				$this->makeSectionHtml(
 					1,
 					'<p>paragraph 3</p>'
 				),
 
 				$enableSections, false, false, false, true,
 			],
 
 			[
 				// 2 hat-notes, ambox, 2 infoboxes, 2 paragraphs, another section
 				'<div class="' . self::HATNOTE_CLASSNAME . '">hatnote</div>' .
 				'<div class="' . self::HATNOTE_CLASSNAME . '">hatnote</div>' .
 				'<table class="ambox"><tr><td>ambox</td></tr></table>' .
 				'<table class="' . self::INFOBOX_CLASSNAME . '"><tr><td>infobox 1</td></tr></table>' .
 				'<table class="' . self::INFOBOX_CLASSNAME . '"><tr><td>infobox 2</td></tr></table>' .
 				'<p>paragraph 1</p>' .
 				'<p>paragraph 2</p>' .
 				'<h2>Heading 1</h2>' .
 				'<p>paragraph 3</p>',
 
 				$this->makeSectionHtml(
 					0,
 					'<div class="' . self::HATNOTE_CLASSNAME . '">hatnote</div>' .
 					'<div class="' . self::HATNOTE_CLASSNAME . '">hatnote</div>' .
 					'<table class="ambox"><tr><td>ambox</td></tr></table>' .
 					'<p>paragraph 1</p>' .
 					'<table class="' . self::INFOBOX_CLASSNAME . '"><tr><td>infobox 1</td></tr></table>' .
 					'<table class="' . self::INFOBOX_CLASSNAME . '"><tr><td>infobox 2</td></tr></table>' .
 					'<p>paragraph 2</p>'
 				) .
 				$this->makeSectionHeading( 'h2', 'Heading 1' ) .
 				$this->makeSectionHtml(
 					1,
 					'<p>paragraph 3</p>'
 				),
 
 				$enableSections, false, false, false, true,
 			],
 
 			[
 				// Minimal test case for T149561: `p` elements should be immediate
 				// descendants of the section container element (`div`, currently).
 
 				'<table class="' . self::INFOBOX_CLASSNAME . '">' .
 				'<tr><td><p>SURPRISE PARAGRAPH</p></td></tr></table>' .
 				'<p>paragraph 1</p>',
 
 				$this->makeSectionHtml(
 					0,
 					'<p>paragraph 1</p>' .
 					'<table class="' . self::INFOBOX_CLASSNAME . '">' .
 					'<tr><td><p>SURPRISE PARAGRAPH</p></td></tr></table>'
 				),
 
 				$enableSections, false, false, false, true,
 			],
 
 			[
 				// T149389: If the infobox is inside one or more containers, i.e. not an
 				// immediate child of the section container element, then
 				// MobileFormatter#moveFirstParagraphBeforeInfobox will trigger a "Not
 				// Found Error" warning.
 				// Do not touch infoboxes that are not immediate children of the lead section
 				'<div><table class="' . self::INFOBOX_CLASSNAME . '"><tr><td>infobox</td></tr></table></div>' .
 				'<p>paragraph 1</p>',
 
 				$this->makeSectionHtml(
 					0,
 					'<div><table class="' . self::INFOBOX_CLASSNAME . '"><tr><td>infobox</td></tr></table></div>' .
 					'<p>paragraph 1</p>'
 				),
 
 				$enableSections, false, false, false, true,
 			],
 		];
 	}
 
 	/**
 	 * @dataProvider provideHeadingTransform
 	 * @covers MobileFormatter::makeSections
 	 * @covers MobileFormatter::enableExpandableSections
 	 * @covers MobileFormatter::filterContent
 	 */
 	public function testHeadingTransform( array $topHeadingTags, $input, $expectedOutput ) {
 		$t = Title::newFromText( 'Mobile' );
 		$formatter = new MobileFormatter( $input, $t );
 
 		// If MobileFormatter#enableExpandableSections isn't called, then headings
 		// won't be transformed.
 		$formatter->enableExpandableSections( true );
 
 		$formatter->topHeadingTags = $topHeadingTags;
 		$formatter->filterContent();
 
 		$this->assertEquals( $expectedOutput, $formatter->getText() );
 	}
 
 	public function provideHeadingTransform() {
 		return [
 
 			// The "in-block" class is added to a subheading.
 			[
 				[ 'h1', 'h2' ],
 				'<h1>Foo</h1><h2>Bar</h2>',
 				$this->makeSectionHtml( 0, '' )
 					. $this->makeSectionHeading( 'h1', 'Foo' )
 					. $this->makeSectionHtml( 1, '<h2 class="in-block">Bar</h2>' )
 			],
 
 			// The "in-block" class is added to a subheading
 			// without overwriting the existing attribute.
 			[
 				[ 'h1', 'h2' ],
 				'<h1>Foo</h1><h2 class="baz">Bar</h2>',
 				$this->makeSectionHtml( 0, '' )
 					. $this->makeSectionHeading( 'h1', 'Foo' )
 					. $this->makeSectionHtml( 1, '<h2 class="baz in-block">Bar</h2>' ),
 			],
 
 			// The "in-block" class is added to all subheadings.
 			[
 				[ 'h1', 'h2', 'h3' ],
 				'<h1>Foo</h1><h2>Bar</h2><h3>Qux</h3>',
 				$this->makeSectionHtml( 0, '' )
 					. $this->makeSectionHeading( 'h1', 'Foo' )
 					. $this->makeSectionHtml( 1, '<h2 class="in-block">Bar</h2><h3 class="in-block">Qux</h3>' )
 			],
 
 			// The first heading found is the highest ranked
 			// subheading.
 			[
 				[ 'h1', 'h2', 'h3' ],
 				'<h2>Bar</h2><h3>Qux</h3>',
 				$this->makeSectionHtml( 0, '' )
 					. $this->makeSectionHeading( 'h2', 'Bar' )
 					. $this->makeSectionHtml( 1, '<h3 class="in-block">Qux</h3>' ),
 			],
 
 			// Unenclosed text is appended to the expandable container.
 			[
 				[ 'h1', 'h2' ],
 				'<h1>Foo</h1><h2>Bar</h2>A',
 				$this->makeSectionHtml( 0, '' )
 					. $this->makeSectionHeading( 'h1', 'Foo' )
 					. $this->makeSectionHtml( 1, '<h2 class="in-block">Bar</h2>A' )
 			],
 
 			// Unencloded text that appears before the first
 			// heading is appended to a container.
 			// FIXME: This behaviour was included for backwards
 			// compatibility but mightn't be necessary.
 			[
 				[ 'h1', 'h2' ],
 				'A<h1>Foo</h1><h2>Bar</h2>',
 				$this->makeSectionHtml( 0, '<p>A</p>' )
 					. $this->makeSectionHeading( 'h1', 'Foo' )
 					. $this->makeSectionHtml( 1, '<h2 class="in-block">Bar</h2>' ),
 			],
 
 			// Multiple headings are handled identically.
 			[
 				[ 'h1', 'h2' ],
 				'<h1>Foo</h1><h2>Bar</h2>Baz<h1>Qux</h1>Quux',
 				$this->makeSectionHtml( 0, '' )
 					. $this->makeSectionHeading( 'h1', 'Foo' )
 					. $this->makeSectionHtml( 1, '<h2 class="in-block">Bar</h2>Baz' )
 					. $this->makeSectionHeading( 'h1', 'Qux', 2 )
 					. $this->makeSectionHtml( 2, 'Quux' ),
 			],
 		];
 	}
 
 	/**
 	 * @dataProvider provideGetImageDimensions
 	 *
 	 * @param array $expected what we expect the dimensions to be.
 	 * @param string $w value of width attribute (if any)
 	 * @param string $h value of height attribute (if any)
 	 * @param string $style value of style attribute (if any)
 	 * @covers MobileFormatter::getImageDimensions
 	 */
 	public function testGetImageDimensions( $expected, $w, $h, $style ) {
 		$mf = new MobileFormatter( '', Title::newFromText( 'Mobile' ) );
 		$doc = new DOMDocument();
 		$img = $doc->createElement( 'img' );
 		if ( $style ) {
 			$img->setAttribute( 'style', $style );
 		}
 		if ( $w ) {
 			$img->setAttribute( 'width', $w );
 		}
 		if ( $h ) {
 			$img->setAttribute( 'height', $h );
 		}
 		$this->assertEquals( $expected, $mf->getImageDimensions( $img ) );
 	}
 
 	public function provideGetImageDimensions() {
 		return [
 			[
 				[ 'width' => '500px', 'height' => '500px' ],
 				'500',
 				'500',
 				''
 			],
 			[
 				[ 'width' => '200px', 'height' => 'auto' ],
 				'500',
 				'500',
 				'width: 200px; height: auto;'
 			],
 			[
 				[ 'width' => '24.412ex', 'height' => '7.343ex' ],
 				'500',
 				'500',
 				'width: 24.412ex; height: 7.343ex'
 			],
 			[
 				[ 'width' => '24.412ex', 'height' => '7.343ex' ],
 				'500',
 				'500',
 				'height: 7.343ex; width: 24.412ex'
 			],
 			[
 				[ 'width' => '24.412ex', 'height' => '7.343ex' ],
 				'500',
 				'500',
 				'height: 7.343ex; background-image: url(foo.jpg); width:    24.412ex   ; '
 					. 'font-family: "Comic Sans";'
 			],
 
 			// <img src="..." alt="..." />
 			[
 				[],
 				'',
 				'',
 				''
 			]
 		];
 	}
 
 	public function testInsertTOCPlaceholder() {
 		$input = '<p>Hello world.</p><h2>Heading</h2>Text.';
 		$mf = new MobileFormatter( $input, Title::newFromText( 'Mobile' ) );
 		$mf->enableTOCPlaceholder();
 		$mf->enableExpandableSections();
 		$mf->topHeadingTags = [ 'h2' ];
 		$mf->filterContent( false, false, false );
 		$expected = $this->makeSectionHtml( 0, '<p>Hello world.</p>' . self::TOC )
 			. $this->makeSectionHeading( 'h2', 'Heading' )
 			. $this->makeSectionHtml( 1, 'Text.' );
 		$this->assertEquals( $expected, $mf->getText() );
 	}
 
 	/**
 	 * @see https://phabricator.wikimedia.org/T137375
 	 */
 	public function testT137375() {
 		$input = '<p>Hello, world!</p><h2>Section heading</h2><ol class="references"></ol>';
 		$formatter = new MobileFormatter( $input, Title::newFromText( 'Special:Foo' ) );
 		$formatter->filterContent( false, true, false );
 	}
 
 	/**
 	 * @see https://phabricator.wikimedia.org/T149884
 	 * @covers MobileFormatter::filterContent
 	 */
 	public function testLoggingOfInfoboxesBeingWrappedInContainers() {
 		$this->setMwGlobals( [
 			'wgMFLogWrappedInfoboxes' => true
 		] );
 
 		$input =
 			'<div><table class="' . self::INFOBOX_CLASSNAME . '"><tr><td>infobox</td></tr></table></div>' .
 			'<p>paragraph 1</p>';
 		$title = 'Special:T149884';
 
 		$formatter = new MobileFormatter( MobileFormatter::wrapHTML( $input ),
 			Title::newFromText( $title ) );
 		$formatter->enableExpandableSections();
 
 		$loggerMock = $this->getMock( \Psr\Log\LoggerInterface::class );
 		$loggerMock->expects( $this->once() )
 			->method( 'debug' )
 			->will( $this->returnCallback( function( $message ) use ( $title ) {
 				// Debug message contains Page title
 				$this->assertContains( $title, $message );
 				// and contains revision id which is 0 by default
 				$this->assertContains( '0', $message );
 			} ) );
 
-		$this->setLogger( 'MobileFrontend', $loggerMock );
+		$this->setLogger( 'mobile', $loggerMock );
 		$formatter->filterContent( false, false, false, true );
 	}
 }