Reordered the CASE statement
Merge branch 'dev' into test