Merge "Add approx_atan function" into jb-mr1-dev