Build 54.1: Nav swap event handling fixed / added