Tasks 720 and 721

https://www.openstreetmap.org/user/Sinitra/diary/40698