Change set 2 on 05-07-2014