Develop- bug fixes 3460, 3461, 3462