Merge "Fixes for sm and pm usage"