Merge "Adding sal-compatibilty feature"