should be rebased by restful branch