Optimize Mountpoint
Solve problems with PA 3.99.1/OTG
Upstream with Franco changes