Merge changes from dalerank