#1486 Possibility of disabling database expansion + doc + integration

Signed-off-by: Maxime DAVID <got2bex@gmail.com>