Add cross version build.
Merge commit '3b7b0a2aaae0a19c3e7398987a9f452edfd4f8a2' into hack