merge updates from development branch to SL6