Merged branches

Take it.