merged commit 0ece2901ec4cd578a78c820d0c40222458433162 from bvidulich