Merge branch 'main' into 688-include-directivity-configuration-text-file-in-self_test-prm-to-increase-coverage