fix BC for #6890 and c91bd9be56e0b194beedde4c78be943591cdc719
fix CS
fix CS
#6924 #6890 - avoiding unused `is_a()` call
#6924 - minor CS fixes in test cases
#6924 - cs fixes: avoiding variables overwrites and removing useless IDE hints
Merge branch 'hotfix/#6924-#6890-abstract-platform-bc-break-revert' into develop

Close #6924