Integration of member_shift_returnable merge

Integration of changes from member_shift_returnable