Changes for EDU-12184
More Changes for EDU-12184