FR #1332 -- Part 1; Methods

Change-Id: I2fd9aeba3faad8b9188e215ce6d491c4c795b6d7