Fixed: #1397 Code Cleanup: remove additional keys mechanism