Transferred change from 278dfcb to scss