This is a friendly version of previous PR#443
Coverage decreased (-0.009%) to 95.348% when pulling 5ed4af6c258016c0b8f704a28c14a4e4cf002ace on YuyuZha0:dev into ac00199379a5fcc4db012d8eb1336c9d9802540d on apache:master.