Trying to fix ambiguous column
Merge branch 'master' into dev