Merge "Change commonRef to avoid using jweak"