Merge back from versly/master.