Merge lessons_learnt and risks update