Upgrade core from 7.15 to 7.18