Merge branch 'new_adn'
little change
flag change
boolean flag change
conflicts