TW: Removing optional lazy dependencies.
TW: Fixed merge conflit.
TW: Updated snapshot version.