Merge "Remove uniform hash" into devel/master