[5.0] Use Short Array Syntax In The Container

Split of #6788