Merge "Modified key event in TC" into devel/master