SW-33. Several final tweaks and doc improvements for pull request