Aux ifdef
Merge commit '0085e16f6d9204650a415040a9da94f8ea425cb3'