Merge branch 'v1.5' into LTS : v1.5.1-20200401