Consolidated PR 15 and PR 16