Fixes for issues from the tracker MDL-35073