Features/re 1310