supersedes #621
@alvaro.sanchez, @tjcorona, @utkarsh.ayachit pending test results, this is good for 5.0.1