[Merge] with latest addons-trunk rev 6777