Merged branch `1.0.0-dev` into `ticket-103-clean`