A port of #13200 into develop

Thanks to @jhenry82 for the good work here. This just ensures his work is
present in the develop branch as well.