Issue #945 Block 7 - Others
Merge pull request #955 from pecko/issue945f

Issue #945 Block 7 - Others