prevent invalid additional data
Merge origin/master