This pull request addresses the following referenced issue(s): Overview of changes: @padthaitofuhot @captntuttle @adrianmo