Merged in keyboard block extensions from Tobias