Merged All Bug Fixes from Develop to v1.2 branch.