import changeset from labx tree: https://github.com/Biamp-Systems/mb-linux/commit/fb727a9cf5c7f1056b5ab1a562273d5b506f7f31