Refactored
Merge branch 'release/1.0.18-3'