Merge branch 'rebase_21-11-24' into 'main'

Rebase MR CY25Q1 1

See merge request !27

Notable changes from base repository: 
 - Fixed CMake build (changed names of library headers)
 - Changed CMake project definition homepage URL to be this repository, rather than upstream.