Add fleray contrib + Merge master with 0.9.5 branch