Reintroduced some more changes from changeset [520] and [540] which where overwritten by changeset [546]
Reintroduced some more changes from changeset [520] and [540] which where overwritten by changeset [546]