Merged version 'francois' 'regis'