CLSN-2195 Profile layout fix