Merge pull request #968 from jjettenn/master

#2306 sprint 43 bug-fix issue 850