Merge "Fix endif position introduced by bootstrap flag"