TRUNK-3926 updated according to comments