Upgrade core to 7.22
Structure and make platform dir group sticky