Forest 53 x 04 jpt v2

New pull request for JPT, must be safely merged now.