Add a switch to enable backw. compatibility

Change-Id: Id74e62428d17ef791aa43665d440b3e89ba9fea0