2057: Fix super long if statement
Merge branch 'dev' into i-2057
Merge branch 'staging' into i-2057
Merge branch 'i-2057' into staging