Update fork [JB branch]

Preparation for version 2.9.0 [JB]