I planned to rebase my commits (patch 170,171,172,173 and 178) once #453 was merged.