This commit includes all remaining changes for the time being including user space updates. Submitted by: bz Approved by: re