fixes for upgrade HR-195

fixes for upgrade HR-195