Merge "Update struct to include far and elr on the NS side" into main