Merge branch 'develop' into 'productMaster_jd4'

# Conflicts:
#   LoginApi/Src/Core/LoginApi.Domain/Exchange/Entities/EmployeeMaster.cs
#   LoginApi/Src/Infrastructure/LoginApi.Infrastructure.Persistence/Contexts/ApplicationDbContext.cs
#   LoginApi/Src/Presentation/LoginApi.WebApi/Program.cs