Dev 10212: review 2