rollback changes from release preparation of suresh-master