Fix merge issues

Authored by jgrulich on Apr 9 2019, 7:08 AM.