Merge current changes to sharing into dev.