[merge] Misc