Merge "Added automatic secret generation"