Fix wrong dependency and bug on UI when merging 'master' into 'feature/relooking'