[232] Preformed a merge bringing immutable-experiment branch up to date with TRUNK (rev.231) before starting refactoring.

Revision: 232
Author: erik.sundvall

Log Message: