add changes from accepted g-s commit.