PR-1: added 7e8460e48c2c13ca091b83c847689545 18