PR 15 and 16 on core