Use post-session workaround for silly PAM
Merge branch 'develop' into patches-3.0
Patch in post session workaround