Control: forcemerge 922423 -1 Cristian, This patch no longer applies. The whitespace and style cleanups will be addressed as part of #922423. So I will merge with that. Thanks Mark