K 10 svn:author V 8 madpilot K 8 svn:date V 27 2017-10-07T14:10:19.271567Z K 7 svn:log V 105 Correctly handle option caused conflict. PR: 222845 Submitted by: O. Hartmann END