WEB-89 bug fix 2.0
mergeconflict fixed