Code cleanup
Merge commit '319f673996566498263062ebb63ee139e4d6be5a'