Changes after the 7.11.2014 samples review.