change stop order
update changelog
javadoc update