BRANCH 4.0:
  fixed some merge mistakes