added preliminary support for newer standards / some cleanups (#6423)

added preliminary support for newer standards / some cleanups (#6423) #12068