merging back changes from kate

Authored by meikm on Aug 29 2018, 9:50 PM.