Bugfix release 1.7.3

Change-Id: Idb85e21e1f04571f35417fbab0da7ff3e6b5f94e