Merge MTD pullreq from 3.15-rc5