CW-57 fixing hint problems
Merge branch 'eliranmal-develop'