enhancement for the implementation of the fix locomotivecms/wagon#62