Fixes merging of VersionOne defects.
Merge commit '2bc6df2789f6f298bda272c6aa54822ba4fcd022' into HEAD