Major commit, pt. #1 (see the last one for details)