082614 1525 merge