Merge "Legacy Size negotiation mapper" into devel/master