Merge branch 'improvement/use-react-lazy-load'