Jmaessen prepare release 1.8.31.3 beta

Merge changes required for 1.8.31.3.