misc commit 24-7-14