Merge "Change DB counting mechanism"