Commit the non-NDB specific part (originated by frazer) to 5.1 mainline.
Attach a file by drag & drop or click to upload
