20140814 merge before