Merge the changes from DEV branches (1.0.3)