Bringing over 0.7.3 changes