[#813] Updates after merge with feature/rsr_v3