Adaption to newer core standards
further adaptions
merge conflict