Task #3901 & #3902 Improve create and update device view