Commit for merge

needed to merge with upstream. commit first.