Preparations for blacklight 5 upgrade