Merge tag 'M13-25' into beta

M13-25