Matthias Wessendorf I initially suggested making this a subtask, but then in a call with Summers, I broke it out into a separate issue (Enhancement), since it's basically independent, and AGDROID-551 doesn't depend on this being done.