This commit contains the following changes: