Merge "BUG-2383 : moved AbstractRIBSupport class"