merging in master for comment branch
unborking
bundled changes