Any23 Component & Spring fixes
courtesy commit