OHENRO-34 #resolve
merged to develop from feature/OHENRO-34