Last modifications before merge with master