DeviceParts+ general rebase and rename of Daniel-GT's original commit.