Gerard Ryan yes there is also this task here: https://issues.jboss.org/browse/AEROGEAR-8085 so there are a number of places to resolve this. There was a comment to wait on this one but think we should create an epic and link these together and flag it as possible work to do.
Christopher Foley Wei Li