Updated scoped keys proposal (13004) and ditaval @style proposal (13090)