[non-BE] Merge BASOP main to main-pc

As the BASOP porting work has started, it would be better to update main-pc with latest main. Similar to the update to float-pc : 405ffc65