[BD-14] Sync 2020-06-24