Use nice Java *default* property syntax.
Fixing dependency version.
Add a more unique way of creating event IDs.
Merge conflicts.
Merge changes.
Conclude merging