Merge "Revert "Cherrypicking flags and override methods for allowing dy...""