TABDEV-2774 - Fixed colapse param
TABDEV-2774 - Fixed unit tests to support collapse
Merge remote-tracking branch 'origin/TABDEV-2774' into develop

# By Rob Derstadt
# Via Rob Derstadt
* origin/TABDEV-2774:
  TABDEV-2774 - Fixed unit tests to support collapse
  TABDEV-2774 - Fixed colapse param