rollback changes from release preparation of ghkh111