TRUNK-257 - review changes v.3