@cvazquez - me and @jobutter would like to merge it before the next Urania release, we try to clean it up within 1 week timescale, we hope it is fine.
cc: @kheinick