Test cases were updated.
Branches CR25465 and CR25488 were squashed and rebased on the current MASTER (12/01/2014)