Merge remote-tracking branch 'james/loop_constants' into claw