explicit ternary operator
Merge branch 'develop'