few fixes for ptbr #2512

Closed
ghost wants to merge 3 commits from master into master

File diff suppressed because one or more lines are too long