bugfix; future improvement resp. experimental code was commented out

Change-Id: Iadc7bc6ffa365fb65854ce79570fb40479db18c3
Merge "bugfix; future improvement resp. experimental code was commented out"