BUG 2197
Merge branch 'BUG2197' into dev