Merging last "wip" commit

Merge of #2227c9