Due to a troubled rebase I created a new branch and MR for this issue.
Issue related
New MR
All new issues are solved in the new MR, also history and code was cleaned up