Add some points which have to be looked into for tango2
Merge remote-tracking branch 'taurel/master'