bbondy merged 1 commit into master from fix/improve-8894 May 19, 2017