Merge "development: Update Calculator libs" into cm-11.0