Conditional compilation added around previous pull request (multi-lines
improvement)