[gh-453] Pull Request from erasmussen2/develop

#443 (closed), #448 (closed), #451 (closed), #452 (closed)