[#1547] revert previous use of issue and fix logic to determine suffix