5.0.3

Merged changes from 5.0.3