Until the new functionality becomes available you can use the workaround solution in the attached project.