Merge from SFTP.
Removed the --diag-supress ifdef, as it was only due to me not being able to spell --diag_suppress! (which is supported on all versions of RVCT)
X one
X two X three X four
X five
X six
X seven
X eight
X nine
X ten
Before 111
Before 222
Before 333
Match
After 111
After 222
After 333
And so on and so on
And so on and so on