merge from mfs-1.6.27-5 (see changes in NEWS)