The modifications in this commit should be part of the previous one
(42ea54c2d03b81a4c2631bf8bb142aeb428f01dd), but due to my mistake were not
added to the change set.