Checking additional preferences and configs.
Nothing special here
Merge remote-tracking branch 'origin/master'