#6386, #6388, #6389 Add language properties