Merge merge-requests '495' and '458'