Merge branch 'ext/anand/stale-devids-free' into for-next-stale-20190409