Issue #8204 by tuj: Further work on angular implementation