merging all stuff from master at v1.9