Merge branch 'feature/update-about-sone' into next