Revision cc73ecec97fc0962c3026806fbc150c3b85d4103

Committed on 07/09/2021 5:11 am by Damian Zabawa <damian.zabawa@ez.no> [GitHub Diff]

Merge branch 1.0 into 2.0