Merge "[RIC-571] Swagger update + release version updated to 5.2.21"