adapt CPS-497 + CPS-498

Change-Id: I4d80bdacec521390e2ee9961c9a87ffa53b2f9e9
adapt CPS-499 

Change-Id: I3704b95cf81ecd6376a756394025b1a28aae8dcc
reference 5.0.1

Change-Id: Id653f487374a8c7efe374ae1f025a3d53e22378f
continue with 1.0.6-SNAPSHOT

Change-Id: I7eb3e960635b81bb8289fb35ba3f86363a41223c