Fetched changes from 5.05.12