Merge "Only bind footer  when flag is enabled." into main