Merge tag 'v1.3.7' into tizen