Follow-ups to https://sbforge.org/fisheye/cru/CR-NAS-237 .
Merge remote-tracking branch 'origin/master'