LPS-38575 Apply SF consitently
LPS-38575 add attribute placeholder to make it fully consistent