Merge "Change dependency" into devel/master