[WIP] Provide bug fixes mergeable with the master

Shall we continue to maintain the 1.0 version for fixes bugs? If yes we need this merge.