Merge "SF: Create a cicular buffer structure to store layer information."