Fix bug wrong dependency version when merge from 'master' into 'feature/relooking'