This is fixed along with the merge: 69b9ef377cd835ec5b8e819de2934260ef47e206