Merge "Defines setting for standalone FAB targets" into main