LPS-33566 Add organization site check
LPS-33566 Source formatting