[ROSAPPS]: Merge the two existing CATs into one and improve it (see r66942, r66989...