Complete implementation of bay operations

Change-Id: I93e42ec86b9d0609d92d1ececb2389200ae368ec
Merge "Complete implementation of bay operations"