Bug fix. There was a bug on the WHERE clause.
Merge branches 'ActionItem2851' and 'stable' into stable