Merge "Fix issue #17536024: The am start's wait option doesn't..." into lmp-dev