This feature is covered in following commits:
5c3be03
c6fad6d
5de4e4a