merge dev to fix class list
latest