doc
search factory refactoring
rename real strategy
minor
refactoring
minor
Merge branch 'develop' into feature-fact
minor
Merge branch 'feature-fact' into develop