Merge remote-tracking branch 'origin/kalpakis_2762'
Merge remote-tracking branch 'origin/Fafoutellis_2968'