Code conventions only
Merge remote-tracking branch 'origin/master'
Take mapping from dependency.