master: d1e714706243ab78de7fd1152e5d9275c6a3d522 add notes