8.6: added juno dev commit for easier commit and version increment
reverted changes to nick collisions because they didn't work