Core update 7.32

Signed-off-by: Thomas Wagner <twagner@ivlab.com>
Core update - cleanup

Signed-off-by: Thomas Wagner <twagner@ivlab.com>