f5c7d50 Merge branch 'feature/Jade' into source