Finish Platform sync (Ref #22)
Sync to joomla/joomla-cms@cd728a9602a0ed561270e76ae9575da7f3a1b943 (Ref #22)