Final Commit for v5.2