Merge changes from topic "eiffel-jjb"