[[ Bug 12780 ]] Remove erroneous ifdef
Merge remote-tracking branch 'ali/bugfix-12780' into bugfix-12780
Merge branch 'bugfix-12780' into develop