Merging recent works on top-level modules into master