Merge v5.3.0 (7fa584b) to production branch