merged trunk & branch - epilogue