Close #1662.
This means a separate api jar and no more inconsistencies between api and core. (fix #1653)