JERSEY-224 & JERSEY-222 part I.

Change-Id: I1a4895195babbbe2cecded157a71bec7af00d581
Merge "JERSEY-224 & JERSEY-222 part I."