Moved todo comments to NAWQAAN-373.