Re #1471 Modify corelib in order to make new API call working.