Update FPRadmin commit

Include FPRAdmin PR's 1, 2, 3, 4