maj 2.2.6 to 2.3.*, PLAYGROUND-502