apply changes from basic-base

Sebastian Listl requested to merge modulesPlatform into main

Merge request reports