Merge changes from V1.0.x branch