Merge commit '09a903ab5b8d940605783ae4ee591c0f090a31d1' * commit '09a903ab5b8d940605783ae4ee591c0f090a31d1': add hidden Options field for native allocations