special behaviour for branch 5.4