Update for 17859 - PTR

Signed-off-by: Sovak <Sovak007@gmail.com>
Merge pull request #4 from Sovak/master

Update for 17859 - PTR