HomePhabricator

Merge pull request #1530 from wikimedia/pr/1529

Description

Merge pull request #1530 from wikimedia/pr/1529

Updated #1529 with requested changes