Merge redevelopment into main

Fully commented files are merged with main for design revision.

Merge request reports

Loading