Merge branch '303-FEAT-FrameGabber_Improvements'