Merge branch 'main' into no-spring-jpa

Due to faulty Git management changes supposed to remain in the spring-jpa
branch were transfered over to the main branch. To undo this state a
branch created from an older state of the main branch will be used