moved latest code changes from develop