Merge "Adapt StatefulConnection class to advance image"