Merge "Intrinsics test" into jb-mr1-dev