CON-30 | WAM - hub_id fix
CON-30 | WAM - hub_id fix [2nd try]
CON-30 | WAM - hub_id fix [3rd try]
Merge branch 'consumer-sprint40-CON-30' into dev