Merge "Assign relative layer respecting cache." into pi-dev