I think it is ok to say that this improvement is out of scope for this branch, and to wait for implementation of http://issues.fluidproject.org/browse/FLUID-4986