refactor merge method
Merge remote-tracking branch 'upstream/develop' into develop
Merge branch 'develop' into feature/access_methods

Conflicts:
	src/Config.php
	src/FileTypeAdapter/AbstractAdapter.php
	src/Interfaces/FileTypeAdapterInterface.php