Merge remote-tracking branch 'upstream/P2_EB6913' into upv2.0
Merge branch 'v2.0.14.04' of http://s29exvm05.na.ipaper.com:8080/gitblit/git/xcomv2 into upv2.0
EB-6807 : Fixed the issue mentioned by John