Resolve #2021 "04 16 branched from master state bug fix"

Merged Taya Snijder requested to merge 2021-04-16-Branched_from_master-state_bug_fix into master

Closes #2021

Merge request reports