initial attempt at fix15678 before I rebased to current master master jump was from 6abf36483a41e50579afcea1497f502875693913 to bd8acc0c6a90971f9d70eda9bc7204470bfb49f7
initial attempt at fix15678 before I rebased to current master master jump was from 6abf36483a41e50579afcea1497f502875693913 to bd8acc0c6a90971f9d70eda9bc7204470bfb49f7