Merge commit '2c9eec6b1d072a665b17dd4285260aa4d4fadcf4' * commit '2c9eec6b1d072a665b17dd4285260aa4d4fadcf4': Debug: Minor cleanup
Merge commit '2c9eec6b1d072a665b17dd4285260aa4d4fadcf4' * commit '2c9eec6b1d072a665b17dd4285260aa4d4fadcf4': Debug: Minor cleanup