Update 14-06-30

Update based on MCC R7