Merge "Fix the calculation of the number of frames" into oc-mr1-dev