Add properties factory bean
Fix properties factory bean
Merge branch 'release/1.4.0'