Merge cherry-picked commit.

2019-08-14, Tomaz Orac