Merge "Fix aprox fs function names bug b206696" into jb-mr1-dev