add dependencies needed because of the merge with Rock master