Option B, Closes #3247189
added 1 commit
Compare with previous version
marked this merge request as ready