Modules pr only followup#196

rufinv merged 2 commits intomainruflab/shimmer:mainfrom

modules-pr-only-followupruflab/shimmer:modules-pr-only-followupCopy head branch name to clipboard