B-55705 Removed unroll annotations to fix filename issue