Merge branch 'devel', remote-tracking branch 'origin'
bump to version 2.54.2