[master] Minor fix and enhancement