Propagated changes related to the fix in rowKey generator