Bug fixes

Merged OsmanTaha requested to merge mergeOsman into main

Merge request reports