merge release 5.3.1