By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of the namerequest license (Apache 2.0).
I force-merged this even though there was probably a merge conflict due to app version, but I think that's OK in this case since 2 PRs are going in at the same time.
Issue #: /bcgov/entity#7653
Description of changes:
By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of the namerequest license (Apache 2.0).