Final config for now
Merge branch 'JBX_STABLE' into JBX