JAL-3141 Changed suffix position to after the extension (removed extension detection...