More changes (including docs) needed for implementing fix Bug#4098.