Merged: https://github.com/pull/2347