MX bean support to main branch

Just migrating from MXBean support to main.