PLT-451 - Remove use of convention and security source

Merge from develop