Minor fix before preparing merge branch