core updated for: bda9b90