core update & commercial fix