JAVAD-1-Merge JAVAD-1-dev-2049 branch into main

Merged Administrator requested to merge JAVAD-1-dev-2049 into main

Merge request reports