Merge "Corner cases handling." into rvc-dev