Merge the contributions from Tango 2 full and the changes on Tango 2 (#8) c834941 verified soujanyaporia Fabrice-TIERCELIN commited on May 25