Rollup of changes #2

This is try number 2 for #501 rollup.