LPS-29927 SF + Shuyang

Hey Cleydyr

Please, finished the missing parts as Brian requested at https://github.com/brianchandotcom/liferay-portal/pull/22425#issuecomment-64133873

Köszi
-tibor