Various (manually) merged changes