20140704 - 184425 Merge Look And Feel