Changes through analysis library. Should be ready after I fix the osp (project).

[#68910816]