Code review changes, rebased to new master