Merge commit '6df012ad2639918f3256340ceb9c07bccfa04cdf' * commit '6df012ad2639918f3256340ceb9c07bccfa04cdf': addresses several bugs: 2206097, 2166583, 2261119, 2216759
Merge commit '6df012ad2639918f3256340ceb9c07bccfa04cdf' * commit '6df012ad2639918f3256340ceb9c07bccfa04cdf': addresses several bugs: 2206097, 2166583, 2261119, 2216759