[RJA-2907][fix] - Missed ternary expression copy and expanding
Merge pull request #1043 from rsvato/master

[RJA-2907][fix] - Missed ternary expression copy and expanding