Merge "BUG 1359:Fixed using option 1"