#8302, #8303 and #8304

#8305

#8283 Getting 8305 close –not quite sure yet.