Fix - unwanted changes from gti-trunk to master