Merge pull request #302 from hflynn/rebased/develop/10531

Addressing ticket 10531 & fixing random typo (rebased onto develop)