Merge "Add ApplyCustomFragmentPrefix" into devel/master