Merge v5.3.0 to production branch

Version v5.3.0 - 7fa584b