HSHARDS-66 add todo for future investigation