Update from the "khorben-n900" branch