Merge "Added nullable callback support"