Modification
Merge from Belias (commit from 31 may 2013)