Added tag 0.5-28 for changeset cbf09c00dd7f9c6060031db6c35e0427f077c172