Enhancements: generate_fake script created
Merge from central repo