changes to merge up to user-none current master