initial values for accept always array
put 'property fixes' into the appropriate object
Merge branch 'refactor' into develop-2