Revert "Merge branch 'develop' into feature/a"

This reverts commit 185453e013bddf20a7ad76f7f9a999d3c13588b7, reversing
changes made to 515ebd05131a166941caf25da0cedeab7f2dbb5b.