Fix #6685 - more changes as per inspection master xls