[merge] Miscellaneous changes