You plan to do this before merging or in a later bug?