Latest commit 6b780eb Mar 8, 2017 rybmat XW-2868: naming issue