Merge commits from main repository

commt the following

- changed version defintion
- made assets related to bakes local