Version 0.5.4: EDU-3774-updated admin