[QDB-15] commented the whenever related data