3.0.3 recommit

Not all changes were committed with the previous commit