Latest changes

Add the latest changes from src:
@fa7dbda
@5a8749a