MQA-978: Disposable feature can cause unnecessary object creation

Squashed commit of the following:

commit 48646cda2924e4efe944565740de8aeb8c9b1b78
Author: Reinhard Nägele <reinhard.naegele@mgm-tp.com>
Date:   Fri Jul 5 15:43:21 2013 +0200

    wip

commit 23aeb7f8a26d8a06c1ae0947af57e0c838c13993
Merge: a6de566 3380452
Author: Reinhard Nägele <reinhard.naegele@mgm-tp.com>
Date:   Fri Jul 5 15:24:06 2013 +0200

    Merge branch 'master' into feature/MQA-978

commit a6de5666db6b22c609e2cb998f103c24afedb9c9
Author: Reinhard Nägele <reinhard.naegele@mgm-tp.com>
Date:   Wed Jul 3 16:05:13 2013 +0200

    wip

commit 40d1277f4a563765fd264a8447f744277b7a2c15
Author: Reinhard Nägele <reinhard.naegele@mgm-tp.com>
Date:   Tue Jul 2 08:51:16 2013 +0200

    wip

commit 7fa734d8b22be46a73b77271089bb55799035310
Author: Reinhard Nägele <reinhard.naegele@mgm-tp.com>
Date:   Mon Jul 1 13:20:55 2013 +0200

    MQA-978: Disposable feature can cause unnecessary object creation

Change-Id: I1968d9361685d5cb1c5f2398228dcf26cfbf606f