Merge "Calculate spacers properly" into rvc-dev